Skip to content

Commit 1f80fba

Browse files
committed
Merge tag 'sh-for-v6.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux
Pull sh updates from John Paul Adrian Glaubitz: "One important fix and one small configuration update. The first patch by Artur Rojek fixes an issue with the J2 firmware loader not being able to find the location of the device tree blob due to insufficient alignment of the .bss section which rendered J2 boards unbootable. The second patch by Johan Korsnes updates the defconfigs on sh to drop the CONFIG_NET_CLS_TCINDEX configuration option which became obsolete after 8c710f7 ("net/sched: Retire tcindex classifier"). Summary: - sh: defconfig: Drop obsolete CONFIG_NET_CLS_TCINDEX - sh: Align .bss section padding to 8-byte boundary" * tag 'sh-for-v6.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux: sh: defconfig: Drop obsolete CONFIG_NET_CLS_TCINDEX sh: Align .bss section padding to 8-byte boundary
2 parents f4d2ef4 + 5f2efd6 commit 1f80fba

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

arch/sh/configs/se7712_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ CONFIG_NET_SCH_TBF=y
5757
CONFIG_NET_SCH_GRED=y
5858
CONFIG_NET_SCH_DSMARK=y
5959
CONFIG_NET_SCH_NETEM=y
60-
CONFIG_NET_CLS_TCINDEX=y
6160
CONFIG_NET_CLS_ROUTE4=y
6261
CONFIG_NET_CLS_FW=y
6362
CONFIG_MTD=y

arch/sh/configs/se7721_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ CONFIG_NET_SCH_TBF=y
5656
CONFIG_NET_SCH_GRED=y
5757
CONFIG_NET_SCH_DSMARK=y
5858
CONFIG_NET_SCH_NETEM=y
59-
CONFIG_NET_CLS_TCINDEX=y
6059
CONFIG_NET_CLS_ROUTE4=y
6160
CONFIG_NET_CLS_FW=y
6261
CONFIG_MTD=y

arch/sh/configs/sh7710voipgw_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ CONFIG_NETFILTER=y
2727
CONFIG_NET_SCHED=y
2828
CONFIG_NET_SCH_CBQ=y
2929
CONFIG_NET_CLS_BASIC=y
30-
CONFIG_NET_CLS_TCINDEX=y
3130
CONFIG_NET_CLS_ROUTE4=y
3231
CONFIG_NET_CLS_U32=y
3332
CONFIG_MTD=y

arch/sh/configs/titan_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ CONFIG_NET_SCH_DSMARK=m
119119
CONFIG_NET_SCH_NETEM=m
120120
CONFIG_NET_SCH_INGRESS=m
121121
CONFIG_NET_CLS_BASIC=m
122-
CONFIG_NET_CLS_TCINDEX=m
123122
CONFIG_NET_CLS_ROUTE4=m
124123
CONFIG_NET_CLS_FW=m
125124
CONFIG_NET_CLS_U32=m

arch/sh/kernel/vmlinux.lds.S

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,20 @@ SECTIONS
7171

7272
. = ALIGN(PAGE_SIZE);
7373
__init_end = .;
74-
BSS_SECTION(0, PAGE_SIZE, 4)
74+
__bss_start = .;
75+
SBSS(0)
76+
. = ALIGN(PAGE_SIZE);
77+
.bss : AT(ADDR(.bss) - LOAD_OFFSET) {
78+
BSS_FIRST_SECTIONS
79+
. = ALIGN(PAGE_SIZE);
80+
*(.bss..page_aligned)
81+
. = ALIGN(PAGE_SIZE);
82+
*(.dynbss)
83+
*(BSS_MAIN)
84+
*(COMMON)
85+
. = ALIGN(8);
86+
}
87+
__bss_stop = .;
7588
_end = . ;
7689

7790
STABS_DEBUG

0 commit comments

Comments
 (0)