Skip to contentSkip to conversation

misc core kernel changes

GIT PULL Ingo Molnar 2 participants 3 messages Apr 2, 2018 – Apr 3, 2018 Documentation

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest core-core-for-linus git tree from:

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

# HEAD: 5ad751053704df3f00d2bb2dc9345c697c212150 panic: Add closing panic marker parenthesis

Two changes:

- add membarriers to Documentation/features/
- fix a minor nit in panic printk formatting

Thanks,

Ingo

------------------>
Borislav Petkov (1):
panic: Add closing panic marker parenthesis

Mathieu Desnoyers (2):
Documentation/features: Allow comments in arch features files Documentation/features, membarriers: Document membarrier-sync-core architecture support

 Documentation/features/list-arch.sh                |  2 +-
 .../sched/membarrier-sync-core/arch-support.txt    | 62 ++++++++++++++++++++++
 kernel/panic.c                                     |  2 +-
 3 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 Documentation/features/sched/membarrier-sync-core/arch-support.txt
Documentation/features/list-arch.sh +1 -1
index c16b5b595688..1ec47c3bb5fa 100755
@@ -17,7 +17,7 @@ for F in */*/arch-support.txt; do
   N=$(grep -h "^# Feature name:"        $F | cut -c25-)
   C=$(grep -h "^#         Kconfig:"     $F | cut -c25-)
   D=$(grep -h "^#         description:" $F | cut -c25-)
-  S=$(grep -hw $ARCH $F | cut -d\| -f3)
+  S=$(grep -hv "^#" $F | grep -w $ARCH | cut -d\| -f3)
 
   printf "%10s/%-22s:%s| %35s # %s\n" "$SUBSYS" "$N" "$S" "$C" "$D"
 done
Documentation/features/sched/membarrier-sync-core/arch-support.txt new file +62 -0

62 lines not on this page · raw message

kernel/panic.c +1 -1
index 2cfef408fec9..9fb023d0cae1 100644
@@ -289,7 +289,7 @@ void panic(const char *fmt, ...)
 		disabled_wait(caller);
 	}
 #endif
-	pr_emerg("---[ end Kernel panic - not syncing: %s\n", buf);
+	pr_emerg("---[ end Kernel panic - not syncing: %s ]---\n", buf);
 	local_irq_enable();
 	for (i = 0; ; i += PANIC_TIMER_STEP) {
 		touch_softlockup_watchdog();
#1 lore raw
Quoted 2 lines · Ingo Molnar

- add membarriers to Documentation/features/

You had actually done this earlier already, so now there are two commits adding it.

Oh well.

Linus

#2 lore raw
Quoted 8 lines · Linus Torvalds
Quoted 2 lines · Ingo Molnar

- add membarriers to Documentation/features/

You had actually done this earlier already, so now there are two commits adding it.

Oh well.

Indeed, I messed up the handling of that patch, sorry about that!

Thanks,

Ingo