Commit 54dce3c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull misc core updates from Ingo Molnar:
 "Two changes:

  - add membarriers to Documentation/features/

  - fix a minor nit in panic printk formatting"

* 'core-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  panic: Add closing panic marker parenthesis
  Documentation/features, membarriers: Document membarrier-sync-core architecture support
  Documentation/features: Allow comments in arch features files
parents 320b164a 5ad75105

Documentation/features/list-arch.sh

+1 −1
Original line number Diff line number Diff line
@@ -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

kernel/panic.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

CRA Git | Maintained and supported by SUSTech CRA and CCSE