summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-03-02 08:05:45 +0100
committerIngo Molnar <mingo@kernel.org>2017-03-02 08:05:45 +0100
commit9d020d33fc1b2faa0eb35859df1381ca5dc94ffe (patch)
treeadcd4356b93b17b42c9e4ef95c3fea3afa52f3ee /arch/x86
parent6b0b7551428e4caae1e2c023a529465a9a9ae2d4 (diff)
parent4977ab6e92e267afe9d8f78438c3db330ca8434c (diff)
downloadlinux-9d020d33fc1b2faa0eb35859df1381ca5dc94ffe.tar.bz2
Merge branch 'linus' into perf/urgent, to resolve conflict
Conflicts: arch/powerpc/configs/85xx/kmp204x_defconfig Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/vmlinux.lds.S2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index ad0118fbce90..c74ae9ce8dc4 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -345,8 +345,6 @@ SECTIONS
DISCARDS
/DISCARD/ : {
*(.eh_frame)
- *(__func_stack_frame_non_standard)
- *(__unreachable)
}
}