Skip to content

Commit 44e40e9

Browse files
committed
Merge branch 'parisc-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parsic updates from Helge Deller: "Enable the sysctl file interface for panic_on_stackoverflow for parisc, a warning fix and a bunch of documentation updates since the parisc website is now at https://parisc.wiki.kernel.org" * 'parisc-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: MAINTAINERS: Update references to parisc website parisc: module: Update references to parisc website parisc: hardware: Update references to parisc website parisc: firmware: Update references to parisc website parisc: Kconfig: Update references to parisc website parisc: add sysctl file interface panic_on_stackoverflow parisc: use -fno-strict-aliasing for decompressor parisc: suppress error messages for 'make clean'
2 parents 8226f11 + 775024c commit 44e40e9

File tree

8 files changed

+22
-17
lines changed

8 files changed

+22
-17
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12841,7 +12841,7 @@ M: "James E.J. Bottomley" <[email protected]>
1284112841
M: Helge Deller <[email protected]>
1284212842
1284312843
S: Maintained
12844-
W: http://www.parisc-linux.org/
12844+
W: https://parisc.wiki.kernel.org
1284512845
Q: http://patchwork.kernel.org/project/linux-parisc/list/
1284612846
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
1284712847
T: git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git

arch/parisc/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ config PARISC
6868
The PA-RISC microprocessor is designed by Hewlett-Packard and used
6969
in many of their workstations & servers (HP9000 700 and 800 series,
7070
and later HP3000 series). The PA-RISC Linux project home page is
71-
at <http://www.parisc-linux.org/>.
71+
at <https://parisc.wiki.kernel.org>.
7272

7373
config CPU_BIG_ENDIAN
7474
def_bool y

arch/parisc/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ KBUILD_IMAGE := vmlinuz
2121

2222
NM = sh $(srctree)/arch/parisc/nm
2323
CHECKFLAGS += -D__hppa__=1
24-
LIBGCC = $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
25-
export LIBGCC
2624

2725
ifdef CONFIG_64BIT
2826
UTS_MACHINE := parisc64
@@ -110,6 +108,8 @@ cflags-$(CONFIG_PA8X00) += -march=2.0 -mschedule=8000
110108
head-y := arch/parisc/kernel/head.o
111109

112110
KBUILD_CFLAGS += $(cflags-y)
111+
LIBGCC := $(shell $(CC) -print-libgcc-file-name)
112+
export LIBGCC
113113

114114
kernel-y := mm/ kernel/ math-emu/
115115

arch/parisc/boot/compressed/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ targets += real2.S firmware.c
1616

1717
KBUILD_CFLAGS := -D__KERNEL__ -O2 -DBOOTLOADER
1818
KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
19+
KBUILD_CFLAGS += -fno-strict-aliasing
1920
KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks -fno-builtin-printf
2021
KBUILD_CFLAGS += -fno-PIE -mno-space-regs -mdisable-fpregs -Os
2122
ifndef CONFIG_64BIT

arch/parisc/kernel/firmware.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
*
55
* PDC == Processor Dependent Code
66
*
7-
* See http://www.parisc-linux.org/documentation/index.html
7+
* See PDC documentation at
8+
* https://parisc.wiki.kernel.org/index.php/Technical_Documentation
89
* for documentation describing the entry points and calling
910
* conventions defined below.
1011
*

arch/parisc/kernel/hardware.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
*
77
* Based on the document "PA-RISC 1.1 I/O Firmware Architecture
88
* Reference Specification", March 7, 1999, version 0.96. This
9-
* is available at http://parisc-linux.org/documentation/
9+
* is available at
10+
* https://parisc.wiki.kernel.org/index.php/Technical_Documentation
1011
*
1112
* Copyright 1999 by Alex deVries <[email protected]>
1213
* and copyright 1999 The Puffin Group Inc.

arch/parisc/kernel/module.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
*
44
* The best reference for this stuff is probably the Processor-
55
* Specific ELF Supplement for PA-RISC:
6-
* http://ftp.parisc-linux.org/docs/arch/elf-pa-hp.pdf
6+
* https://parisc.wiki.kernel.org/index.php/File:Elf-pa-hp.pdf
77
*
8-
* Linux/PA-RISC Project (http://www.parisc-linux.org/)
8+
* Linux/PA-RISC Project
99
* Copyright (C) 2003 Randolph Chung <tausq at debian . org>
1010
* Copyright (C) 2008 Helge Deller <[email protected]>
1111
*

kernel/sysctl.c

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -994,30 +994,32 @@ static struct ctl_table kern_table[] = {
994994
.proc_handler = proc_dointvec,
995995
},
996996
#endif
997-
#if defined(CONFIG_X86)
997+
998+
#if (defined(CONFIG_X86_32) || defined(CONFIG_PARISC)) && \
999+
defined(CONFIG_DEBUG_STACKOVERFLOW)
9981000
{
999-
.procname = "panic_on_unrecovered_nmi",
1000-
.data = &panic_on_unrecovered_nmi,
1001+
.procname = "panic_on_stackoverflow",
1002+
.data = &sysctl_panic_on_stackoverflow,
10011003
.maxlen = sizeof(int),
10021004
.mode = 0644,
10031005
.proc_handler = proc_dointvec,
10041006
},
1007+
#endif
1008+
#if defined(CONFIG_X86)
10051009
{
1006-
.procname = "panic_on_io_nmi",
1007-
.data = &panic_on_io_nmi,
1010+
.procname = "panic_on_unrecovered_nmi",
1011+
.data = &panic_on_unrecovered_nmi,
10081012
.maxlen = sizeof(int),
10091013
.mode = 0644,
10101014
.proc_handler = proc_dointvec,
10111015
},
1012-
#ifdef CONFIG_DEBUG_STACKOVERFLOW
10131016
{
1014-
.procname = "panic_on_stackoverflow",
1015-
.data = &sysctl_panic_on_stackoverflow,
1017+
.procname = "panic_on_io_nmi",
1018+
.data = &panic_on_io_nmi,
10161019
.maxlen = sizeof(int),
10171020
.mode = 0644,
10181021
.proc_handler = proc_dointvec,
10191022
},
1020-
#endif
10211023
{
10221024
.procname = "bootloader_type",
10231025
.data = &bootloader_type,

0 commit comments

Comments
 (0)