All of lore.kernel.org
 help / color / mirror / Atom feed
* [GIT pull] core updates for 5.1
@ 2019-03-24 14:12 Thomas Gleixner
  2019-03-24 14:12 ` [GIT pull] timers " Thomas Gleixner
                   ` (6 more replies)
  0 siblings, 7 replies; 19+ messages in thread
From: Thomas Gleixner @ 2019-03-24 14:12 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel, x86

Linus,

please pull the latest core-urgent-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus

Two small fixes:

 - Move the large objtool_file struct off the stack so objtool works in
   setups with a tight stack limit.

 - Make a few variables static in the watchdog core code.

Thanks,

	tglx

------------------>
Josh Poimboeuf (1):
      objtool: Move objtool_file struct off the stack

Valdis Kletnieks (1):
      watchdog/core: Make variables static


 kernel/watchdog.c     | 4 ++--
 tools/objtool/check.c | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 8fbfda94a67b..403c9bd90413 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -42,9 +42,9 @@ int __read_mostly watchdog_user_enabled = 1;
 int __read_mostly nmi_watchdog_user_enabled = NMI_WATCHDOG_DEFAULT;
 int __read_mostly soft_watchdog_user_enabled = 1;
 int __read_mostly watchdog_thresh = 10;
-int __read_mostly nmi_watchdog_available;
+static int __read_mostly nmi_watchdog_available;
 
-struct cpumask watchdog_allowed_mask __read_mostly;
+static struct cpumask watchdog_allowed_mask __read_mostly;
 
 struct cpumask watchdog_cpumask __read_mostly;
 unsigned long *watchdog_cpumask_bits = cpumask_bits(&watchdog_cpumask);
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 0414a0d52262..5dde107083c6 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -2184,9 +2184,10 @@ static void cleanup(struct objtool_file *file)
 	elf_close(file->elf);
 }
 
+static struct objtool_file file;
+
 int check(const char *_objname, bool orc)
 {
-	struct objtool_file file;
 	int ret, warnings = 0;
 
 	objname = _objname;


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [GIT pull] core updates for 5.1
@ 2019-03-31 10:39 Thomas Gleixner
  2019-03-31 16:00 ` pr-tracker-bot
  0 siblings, 1 reply; 19+ messages in thread
From: Thomas Gleixner @ 2019-03-31 10:39 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel, x86

Linus,

please pull the latest core-urgent-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus

up to:  7dd476171149 ("watchdog: Respect watchdog cpumask on CPU hotplug")

A small set of core updates:

 - Make the watchdog respect the selected CPU mask again. That was broken
   by the rework of the watchdog thread management and caused inconsistent
   state and NMI watchdog being unstoppable.

 - Ensure that the objtool build can find the libelf location.

 - Remove dead kcore stub code

Thanks,

	tglx

------------------>
Bhupesh Sharma (1):
      proc/kcore: Remove unused kclist_add_remap()

Rolf Eike Beer (1):
      objtool: Query pkg-config for libelf location

Thomas Gleixner (1):
      watchdog: Respect watchdog cpumask on CPU hotplug


 Makefile               |  4 +++-
 include/linux/kcore.h  | 11 -----------
 kernel/watchdog.c      |  6 ++++--
 tools/objtool/Makefile |  7 +++++--
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index c0a34064c574..eef3d3f87c3b 100644
--- a/Makefile
+++ b/Makefile
@@ -950,9 +950,11 @@ mod_sign_cmd = true
 endif
 export mod_sign_cmd
 
+HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf)
+
 ifdef CONFIG_STACK_VALIDATION
   has_libelf := $(call try-run,\
-		echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0)
+		echo "int main() {}" | $(HOSTCC) -xc -o /dev/null $(HOST_LIBELF_LIBS) -,1,0)
   ifeq ($(has_libelf),1)
     objtool_target := tools/objtool FORCE
   else
diff --git a/include/linux/kcore.h b/include/linux/kcore.h
index c843f4a9c512..da676cdbd727 100644
--- a/include/linux/kcore.h
+++ b/include/linux/kcore.h
@@ -38,12 +38,6 @@ struct vmcoredd_node {
 
 #ifdef CONFIG_PROC_KCORE
 void __init kclist_add(struct kcore_list *, void *, size_t, int type);
-static inline
-void kclist_add_remap(struct kcore_list *m, void *addr, void *vaddr, size_t sz)
-{
-	m->vaddr = (unsigned long)vaddr;
-	kclist_add(m, addr, sz, KCORE_REMAP);
-}
 
 extern int __init register_mem_pfn_is_ram(int (*fn)(unsigned long pfn));
 #else
@@ -51,11 +45,6 @@ static inline
 void kclist_add(struct kcore_list *new, void *addr, size_t size, int type)
 {
 }
-
-static inline
-void kclist_add_remap(struct kcore_list *m, void *addr, void *vaddr, size_t sz)
-{
-}
 #endif
 
 #endif /* _LINUX_KCORE_H */
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 403c9bd90413..6a5787233113 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -554,13 +554,15 @@ static void softlockup_start_all(void)
 
 int lockup_detector_online_cpu(unsigned int cpu)
 {
-	watchdog_enable(cpu);
+	if (cpumask_test_cpu(cpu, &watchdog_allowed_mask))
+		watchdog_enable(cpu);
 	return 0;
 }
 
 int lockup_detector_offline_cpu(unsigned int cpu)
 {
-	watchdog_disable(cpu);
+	if (cpumask_test_cpu(cpu, &watchdog_allowed_mask))
+		watchdog_disable(cpu);
 	return 0;
 }
 
diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
index c9d038f91af6..53f8be0f4a1f 100644
--- a/tools/objtool/Makefile
+++ b/tools/objtool/Makefile
@@ -25,14 +25,17 @@ LIBSUBCMD		= $(LIBSUBCMD_OUTPUT)libsubcmd.a
 OBJTOOL    := $(OUTPUT)objtool
 OBJTOOL_IN := $(OBJTOOL)-in.o
 
+LIBELF_FLAGS := $(shell pkg-config libelf --cflags 2>/dev/null)
+LIBELF_LIBS  := $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf)
+
 all: $(OBJTOOL)
 
 INCLUDES := -I$(srctree)/tools/include \
 	    -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \
 	    -I$(srctree)/tools/objtool/arch/$(ARCH)/include
 WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed
-CFLAGS   += -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES)
-LDFLAGS  += -lelf $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)
+CFLAGS   += -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS)
+LDFLAGS  += $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)
 
 # Allow old libelf to be used:
 elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(CC) $(CFLAGS) -x c -E - | grep elf_getshdr)


^ permalink raw reply related	[flat|nested] 19+ messages in thread
end of thread, other threads:[~2019-03-31 16:00 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-24 14:12 [GIT pull] core updates for 5.1 Thomas Gleixner
2019-03-24 14:12 ` [GIT pull] timers " Thomas Gleixner
2019-03-24 18:40   ` pr-tracker-bot
2019-03-24 14:12 ` [GIT pull] irq " Thomas Gleixner
2019-03-24 18:40   ` pr-tracker-bot
2019-03-24 14:12 ` [GIT pull] perf " Thomas Gleixner
2019-03-24 18:40   ` pr-tracker-bot
2019-03-24 14:12 ` [GIT pull] x86 " Thomas Gleixner
2019-03-24 18:40   ` pr-tracker-bot
2019-03-24 14:12 ` [GIT pull] locking " Thomas Gleixner
2019-03-24 18:40   ` pr-tracker-bot
2019-03-24 14:12 ` [GIT pull] scheduler " Thomas Gleixner
2019-03-24 18:07   ` Linus Torvalds
2019-03-24 18:39     ` Thomas Gleixner
2019-03-24 18:48       ` Linus Torvalds
2019-03-24 19:01         ` Linus Torvalds
2019-03-24 18:40 ` [GIT pull] core " pr-tracker-bot
2019-03-31 10:39 Thomas Gleixner
2019-03-31 16:00 ` pr-tracker-bot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.