From: Mark Rutland <mark.rutland@arm.com>
Date: Mon, 13 Jun 2016 16:57:02 +0000 (+0100)
Subject: UPSTREAM: arm64: mm: mark fault_info table const
X-Git-Tag: firefly_0821_release~176^2~142
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6763781e70cc782060611eef91aa27166e418992;p=firefly-linux-kernel-4.4.55.git

UPSTREAM: arm64: mm: mark fault_info table const

Unlike the debug_fault_info table, we never intentionally alter the
fault_info table at runtime, and all derived pointers are treated as
const currently.

Make the table const so that it can be placed in .rodata and protected
from unintentional writes, as we do for the syscall tables.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

Change-Id: I3fb0bb55427835c165cc377d8dc2a3fa9e6e950d
(cherry picked from commit bbb1681ee3653bdcfc6a4ba31902738118311fd4)
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
---

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index edc3e20f7ba9..caca03becf9d 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -438,7 +438,7 @@ static int do_bad(unsigned long addr, unsigned int esr, struct pt_regs *regs)
 	return 1;
 }
 
-static struct fault_info {
+static const struct fault_info {
 	int	(*fn)(unsigned long addr, unsigned int esr, struct pt_regs *regs);
 	int	sig;
 	int	code;