diff options
| author | Linus Torvalds | 2018-04-02 18:08:26 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2018-04-02 18:08:26 +0200 |
| commit | 54dce3c35bbbeaab8de4b82d3ef3a2f011229662 (patch) | |
| tree | d18c5358a9ee9344ac5350e3315d8822464c7698 | |
| parent | Merge tag 'drm-for-v4.17' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | panic: Add closing panic marker parenthesis (diff) | |
| download | kernel-qcow2-linux-54dce3c35bbbeaab8de4b82d3ef3a2f011229662.tar.gz kernel-qcow2-linux-54dce3c35bbbeaab8de4b82d3ef3a2f011229662.tar.xz kernel-qcow2-linux-54dce3c35bbbeaab8de4b82d3ef3a2f011229662.zip | |
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
| -rwxr-xr-x | Documentation/features/list-arch.sh | 2 | ||||
| -rw-r--r-- | kernel/panic.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/features/list-arch.sh b/Documentation/features/list-arch.sh index c16b5b595688..1ec47c3bb5fa 100755 --- a/Documentation/features/list-arch.sh +++ b/Documentation/features/list-arch.sh @@ -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 diff --git a/kernel/panic.c b/kernel/panic.c index 4b794f1d8561..9d833d913c84 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -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(); |