diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-04-05 12:28:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-04-05 12:28:23 +0200 |
| commit | c43adeec3697f6510dccdad888e4681a5063128f (patch) | |
| tree | be2e02b32e4ca3e5bf4fc185da1d178ca4a256bb /arch/arm | |
| parent | f4d3e2f7ddeb77c0fee60a5ee57d030c5fe3057f (diff) | |
| parent | b5effd3815ccbe3df1a015a6d67d8a24a27813d5 (diff) | |
| download | linux-next-c43adeec3697f6510dccdad888e4681a5063128f.tar.gz | |
Merge branch 'x86/asm'
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/vmlinux-xip.lds.S | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/vmlinux-xip.lds.S b/arch/arm/kernel/vmlinux-xip.lds.S index 37b2a11af345..8265b116218d 100644 --- a/arch/arm/kernel/vmlinux-xip.lds.S +++ b/arch/arm/kernel/vmlinux-xip.lds.S @@ -242,6 +242,8 @@ SECTIONS } _edata_loc = __data_loc + SIZEOF(.data); + BUG_TABLE + #ifdef CONFIG_HAVE_TCM /* * We align everything to a page boundary so we can diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index ce18007f9e4e..c83a7ba737d6 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -262,6 +262,8 @@ SECTIONS } _edata_loc = __data_loc + SIZEOF(.data); + BUG_TABLE + #ifdef CONFIG_HAVE_TCM /* * We align everything to a page boundary so we can |