Commit 44e40e96 authored by Linus Torvalds's avatar Linus Torvalds

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'
parents 8226f113 775024cf
...@@ -12841,7 +12841,7 @@ M: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> ...@@ -12841,7 +12841,7 @@ M: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
M: Helge Deller <deller@gmx.de> M: Helge Deller <deller@gmx.de>
L: linux-parisc@vger.kernel.org L: linux-parisc@vger.kernel.org
S: Maintained S: Maintained
W: http://www.parisc-linux.org/ W: https://parisc.wiki.kernel.org
Q: http://patchwork.kernel.org/project/linux-parisc/list/ Q: http://patchwork.kernel.org/project/linux-parisc/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
......
...@@ -68,7 +68,7 @@ config PARISC ...@@ -68,7 +68,7 @@ config PARISC
The PA-RISC microprocessor is designed by Hewlett-Packard and used The PA-RISC microprocessor is designed by Hewlett-Packard and used
in many of their workstations & servers (HP9000 700 and 800 series, in many of their workstations & servers (HP9000 700 and 800 series,
and later HP3000 series). The PA-RISC Linux project home page is and later HP3000 series). The PA-RISC Linux project home page is
at <http://www.parisc-linux.org/>. at <https://parisc.wiki.kernel.org>.
config CPU_BIG_ENDIAN config CPU_BIG_ENDIAN
def_bool y def_bool y
......
...@@ -21,8 +21,6 @@ KBUILD_IMAGE := vmlinuz ...@@ -21,8 +21,6 @@ KBUILD_IMAGE := vmlinuz
NM = sh $(srctree)/arch/parisc/nm NM = sh $(srctree)/arch/parisc/nm
CHECKFLAGS += -D__hppa__=1 CHECKFLAGS += -D__hppa__=1
LIBGCC = $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
export LIBGCC
ifdef CONFIG_64BIT ifdef CONFIG_64BIT
UTS_MACHINE := parisc64 UTS_MACHINE := parisc64
...@@ -110,6 +108,8 @@ cflags-$(CONFIG_PA8X00) += -march=2.0 -mschedule=8000 ...@@ -110,6 +108,8 @@ cflags-$(CONFIG_PA8X00) += -march=2.0 -mschedule=8000
head-y := arch/parisc/kernel/head.o head-y := arch/parisc/kernel/head.o
KBUILD_CFLAGS += $(cflags-y) KBUILD_CFLAGS += $(cflags-y)
LIBGCC := $(shell $(CC) -print-libgcc-file-name)
export LIBGCC
kernel-y := mm/ kernel/ math-emu/ kernel-y := mm/ kernel/ math-emu/
......
...@@ -16,6 +16,7 @@ targets += real2.S firmware.c ...@@ -16,6 +16,7 @@ targets += real2.S firmware.c
KBUILD_CFLAGS := -D__KERNEL__ -O2 -DBOOTLOADER KBUILD_CFLAGS := -D__KERNEL__ -O2 -DBOOTLOADER
KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
KBUILD_CFLAGS += -fno-strict-aliasing
KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks -fno-builtin-printf KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks -fno-builtin-printf
KBUILD_CFLAGS += -fno-PIE -mno-space-regs -mdisable-fpregs -Os KBUILD_CFLAGS += -fno-PIE -mno-space-regs -mdisable-fpregs -Os
ifndef CONFIG_64BIT ifndef CONFIG_64BIT
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
* *
* PDC == Processor Dependent Code * PDC == Processor Dependent Code
* *
* See http://www.parisc-linux.org/documentation/index.html * See PDC documentation at
* https://parisc.wiki.kernel.org/index.php/Technical_Documentation
* for documentation describing the entry points and calling * for documentation describing the entry points and calling
* conventions defined below. * conventions defined below.
* *
......
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
* *
* Based on the document "PA-RISC 1.1 I/O Firmware Architecture * Based on the document "PA-RISC 1.1 I/O Firmware Architecture
* Reference Specification", March 7, 1999, version 0.96. This * Reference Specification", March 7, 1999, version 0.96. This
* is available at http://parisc-linux.org/documentation/ * is available at
* https://parisc.wiki.kernel.org/index.php/Technical_Documentation
* *
* Copyright 1999 by Alex deVries <alex@onefishtwo.ca> * Copyright 1999 by Alex deVries <alex@onefishtwo.ca>
* and copyright 1999 The Puffin Group Inc. * and copyright 1999 The Puffin Group Inc.
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* *
* The best reference for this stuff is probably the Processor- * The best reference for this stuff is probably the Processor-
* Specific ELF Supplement for PA-RISC: * Specific ELF Supplement for PA-RISC:
* http://ftp.parisc-linux.org/docs/arch/elf-pa-hp.pdf * https://parisc.wiki.kernel.org/index.php/File:Elf-pa-hp.pdf
* *
* Linux/PA-RISC Project (http://www.parisc-linux.org/) * Linux/PA-RISC Project
* Copyright (C) 2003 Randolph Chung <tausq at debian . org> * Copyright (C) 2003 Randolph Chung <tausq at debian . org>
* Copyright (C) 2008 Helge Deller <deller@gmx.de> * Copyright (C) 2008 Helge Deller <deller@gmx.de>
* *
......
...@@ -994,30 +994,32 @@ static struct ctl_table kern_table[] = { ...@@ -994,30 +994,32 @@ static struct ctl_table kern_table[] = {
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#endif #endif
#if defined(CONFIG_X86)
#if (defined(CONFIG_X86_32) || defined(CONFIG_PARISC)) && \
defined(CONFIG_DEBUG_STACKOVERFLOW)
{ {
.procname = "panic_on_unrecovered_nmi", .procname = "panic_on_stackoverflow",
.data = &panic_on_unrecovered_nmi, .data = &sysctl_panic_on_stackoverflow,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#endif
#if defined(CONFIG_X86)
{ {
.procname = "panic_on_io_nmi", .procname = "panic_on_unrecovered_nmi",
.data = &panic_on_io_nmi, .data = &panic_on_unrecovered_nmi,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#ifdef CONFIG_DEBUG_STACKOVERFLOW
{ {
.procname = "panic_on_stackoverflow", .procname = "panic_on_io_nmi",
.data = &sysctl_panic_on_stackoverflow, .data = &panic_on_io_nmi,
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#endif
{ {
.procname = "bootloader_type", .procname = "bootloader_type",
.data = &bootloader_type, .data = &bootloader_type,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment