[PATCH] kbuild: tar-pkg: enable communication with jobserver
The buildtar script might want to invoke a make, so tell the parent make to pass the jobserver token pipe to the subcommand by prefixing the command with a +. This addresses the issue seen here: /bin/sh ../scripts/package/buildtar tar-pkg make[3]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. See https://www.gnu.org/software/make/manual/html_node/Job-Slots.html for more information. Signed-off-by: Trevor Bourget --- scripts/package/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/package/Makefile b/scripts/package/Makefile index 27b42d5b6c4f..ca7f46b562a4 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile @@ -104,7 +104,7 @@ clean-dirs += $(objtree)/snap/ # --- tar%pkg: FORCE $(MAKE) -f $(srctree)/Makefile - $(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@ + +$(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@ clean-dirs += $(objtree)/tar-install/ -- 2.22.0.rc1.257.g3120a18244-goog
[PATCH] vt: configurable number of console devices
Having 63 vt devices for embedded systems might be overkill, so provide a configuration MAX_NR_CONSOLES to allow this consumption to be reduced. Signed-off-by: Trevor Bourget --- drivers/tty/Kconfig | 9 + include/uapi/linux/vt.h | 4 2 files changed, 13 insertions(+) diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig index 3b1d312bb175..98e21589f4af 100644 --- a/drivers/tty/Kconfig +++ b/drivers/tty/Kconfig @@ -42,6 +42,15 @@ config VT If unsure, say Y, or else you won't be able to do much with your new shiny Linux system :-) +config MAX_NR_CONSOLES + int "Maximum number of consoles to permit" + depends on VT + range 1 63 + default "63" + ---help--- + The maximum number of consoles that can be used. + The default is 63. + config CONSOLE_TRANSLATIONS depends on VT default y diff --git a/include/uapi/linux/vt.h b/include/uapi/linux/vt.h index e9d39c48520a..3567dd239758 100644 --- a/include/uapi/linux/vt.h +++ b/include/uapi/linux/vt.h @@ -8,9 +8,13 @@ * resizing). */ #define MIN_NR_CONSOLES 1 /* must be at least 1 */ +#ifdef CONFIG_MAX_NR_CONSOLES +#define MAX_NR_CONSOLES CONFIG_MAX_NR_CONSOLES +#else #define MAX_NR_CONSOLES63 /* serial lines start at 64 */ /* Note: the ioctl VT_GETSTATE does not work for consoles 16 and higher (since it returns a short) */ +#endif /* 0x56 is 'V', to avoid collision with termios and kd */ -- 2.22.0.rc1.257.g3120a18244-goog
Re: [PATCH] vt: configurable number of console devices
Sorry, I hadn't registered that was uapi. You are right, as a configuration setting it's an odd thing to expose there. That define won't really be any use to user space except for type range validation, and as such it would actually be unhelpful for it to be other than 63. I will add if defined(__KERNEL__) to improve that, so that it will be constant for uapi. btw The idea is obviously not new. I can give credit to James Cox who posted an actual patch 15 years ago that never merged. https://lore.kernel.org/lkml/e1bfhph-00027s...@smtp.gentoo.org/ -- Trevor On Wed, May 29, 2019 at 4:03 AM Jiri Slaby wrote: > > On 28. 05. 19, 6:31, Trevor Bourget wrote: > > --- a/include/uapi/linux/vt.h > > +++ b/include/uapi/linux/vt.h > > @@ -8,9 +8,13 @@ > > * resizing). > > */ > > #define MIN_NR_CONSOLES 1 /* must be at least 1 */ > > +#ifdef CONFIG_MAX_NR_CONSOLES > > +#define MAX_NR_CONSOLES CONFIG_MAX_NR_CONSOLES > > This is an uapi header. Will the #ifdef work there? As I don't think > CONFIG_* (i.e. autoconf.h) is available in userspace... > > Also, I am not sure if there is any consumer of this macro in userspace > at all -- so what are the possible effects of this being "incorrect"? > > BTW having headers from one kernel and booting another with different > settings makes this definition also incorrect. The same as for e.g. the > HZ constant. Again, not sure if this is a problem at all. > > thanks, > -- > js > suse labs
