Skip to content

Commit 2e7dc31

Browse files
umiddelbumiddelb
committed
Khadas VIM: Make the kernel source compile without error again
after applying the AUFS patches against 3.14.29. Signed-off-by: Uli Middelberg <uli@middelberg.de>
1 parent 2a0514c commit 2e7dc31

File tree

4 files changed

+13
-143
lines changed

4 files changed

+13
-143
lines changed

‎arch/arm64/configs/kvim_defconfig

+11-133
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ CONFIG_IP_PNP_DHCP=y
8585
CONFIG_IP_PNP_BOOTP=y
8686
CONFIG_IP_PNP_RARP=y
8787
CONFIG_NET_IPIP=y
88+
CONFIG_SYN_COOKIES=y
8889
CONFIG_INET_ESP=y
8990
# CONFIG_INET_LRO is not set
9091
CONFIG_IPV6=y
@@ -100,11 +101,7 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
100101
# CONFIG_ANDROID_PARANOID_NETWORK is not set
101102
CONFIG_NETFILTER=y
102103
CONFIG_NF_CONNTRACK=y
103-
CONFIG_NF_CONNTRACK_SECMARK=y
104-
CONFIG_NF_CONNTRACK_ZONES=y
105104
CONFIG_NF_CONNTRACK_EVENTS=y
106-
CONFIG_NF_CONNTRACK_TIMEOUT=y
107-
CONFIG_NF_CONNTRACK_TIMESTAMP=y
108105
CONFIG_NF_CT_PROTO_DCCP=y
109106
CONFIG_NF_CT_PROTO_SCTP=y
110107
CONFIG_NF_CT_PROTO_UDPLITE=y
@@ -113,197 +110,78 @@ CONFIG_NF_CONNTRACK_FTP=y
113110
CONFIG_NF_CONNTRACK_H323=y
114111
CONFIG_NF_CONNTRACK_IRC=y
115112
CONFIG_NF_CONNTRACK_NETBIOS_NS=y
116-
CONFIG_NF_CONNTRACK_SNMP=y
117113
CONFIG_NF_CONNTRACK_PPTP=y
118114
CONFIG_NF_CONNTRACK_SANE=y
119-
CONFIG_NF_CONNTRACK_SIP=y
120115
CONFIG_NF_CONNTRACK_TFTP=y
116+
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
121117
CONFIG_NF_CT_NETLINK=y
122-
CONFIG_NF_CT_NETLINK_TIMEOUT=y
123-
CONFIG_NF_CT_NETLINK_HELPER=y
124-
CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
125-
CONFIG_NF_TABLES=y
126-
CONFIG_NF_TABLES_INET=y
127-
CONFIG_NFT_EXTHDR=y
128-
CONFIG_NFT_META=y
129-
CONFIG_NFT_CT=y
130-
CONFIG_NFT_RBTREE=y
131-
CONFIG_NFT_HASH=y
132-
CONFIG_NFT_COUNTER=y
133-
CONFIG_NFT_LOG=y
134-
CONFIG_NFT_LIMIT=y
135-
CONFIG_NFT_NAT=y
136-
CONFIG_NFT_QUEUE=y
137-
CONFIG_NFT_REJECT=y
138-
CONFIG_NFT_COMPAT=y
139-
CONFIG_NETFILTER_XT_TARGET_AUDIT=y
140-
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y
141118
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
142119
CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
143-
CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
144-
CONFIG_NETFILTER_XT_TARGET_DSCP=y
145-
CONFIG_NETFILTER_XT_TARGET_HMARK=y
146120
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
147-
CONFIG_NETFILTER_XT_TARGET_LED=y
148-
CONFIG_NETFILTER_XT_TARGET_LOG=y
149121
CONFIG_NETFILTER_XT_TARGET_MARK=y
150122
CONFIG_NETFILTER_XT_TARGET_NFLOG=y
151123
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
152-
CONFIG_NETFILTER_XT_TARGET_NOTRACK=y
153-
CONFIG_NETFILTER_XT_TARGET_TEE=y
154124
CONFIG_NETFILTER_XT_TARGET_TPROXY=y
155125
CONFIG_NETFILTER_XT_TARGET_TRACE=y
156-
CONFIG_NETFILTER_XT_TARGET_SECMARK=y
157-
CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
158-
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y
159-
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
160-
CONFIG_NETFILTER_XT_MATCH_BPF=y
161-
CONFIG_NETFILTER_XT_MATCH_CGROUP=y
162-
CONFIG_NETFILTER_XT_MATCH_CLUSTER=y
163126
CONFIG_NETFILTER_XT_MATCH_COMMENT=y
164127
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
165-
CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y
166128
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
167129
CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
168130
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
169-
CONFIG_NETFILTER_XT_MATCH_CPU=y
170-
CONFIG_NETFILTER_XT_MATCH_DCCP=y
171-
CONFIG_NETFILTER_XT_MATCH_DEVGROUP=y
172-
CONFIG_NETFILTER_XT_MATCH_DSCP=y
173-
CONFIG_NETFILTER_XT_MATCH_ESP=y
174131
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
175132
CONFIG_NETFILTER_XT_MATCH_HELPER=y
176-
CONFIG_NETFILTER_XT_MATCH_IPCOMP=y
177133
CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
178-
CONFIG_NETFILTER_XT_MATCH_IPVS=y
179134
CONFIG_NETFILTER_XT_MATCH_LENGTH=y
180135
CONFIG_NETFILTER_XT_MATCH_LIMIT=y
181136
CONFIG_NETFILTER_XT_MATCH_MAC=y
182137
CONFIG_NETFILTER_XT_MATCH_MARK=y
183-
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
184-
CONFIG_NETFILTER_XT_MATCH_NFACCT=y
185-
CONFIG_NETFILTER_XT_MATCH_OSF=y
186-
CONFIG_NETFILTER_XT_MATCH_OWNER=y
187138
CONFIG_NETFILTER_XT_MATCH_POLICY=y
188-
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y
189139
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
140+
CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
190141
CONFIG_NETFILTER_XT_MATCH_QUOTA=y
191142
CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
192-
CONFIG_NETFILTER_XT_MATCH_RATEEST=y
193-
CONFIG_NETFILTER_XT_MATCH_REALM=y
194-
CONFIG_NETFILTER_XT_MATCH_RECENT=y
195-
CONFIG_NETFILTER_XT_MATCH_SCTP=y
143+
CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
196144
CONFIG_NETFILTER_XT_MATCH_SOCKET=y
197145
CONFIG_NETFILTER_XT_MATCH_STATE=y
198146
CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
199147
CONFIG_NETFILTER_XT_MATCH_STRING=y
200-
CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
201148
CONFIG_NETFILTER_XT_MATCH_TIME=y
202149
CONFIG_NETFILTER_XT_MATCH_U32=y
150+
CONFIG_NETFILTER_XT_MATCH_ECN=y
151+
CONFIG_NETFILTER_XT_MATCH_HL=y
152+
CONFIG_NETFILTER_XT_MATCH_IPVS=y
153+
# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
203154
CONFIG_IP_SET=m
204-
CONFIG_IP_SET_BITMAP_IP=m
205-
CONFIG_IP_SET_BITMAP_IPMAC=m
206-
CONFIG_IP_SET_BITMAP_PORT=m
207-
CONFIG_IP_SET_HASH_IP=m
208-
CONFIG_IP_SET_HASH_IPPORT=m
209-
CONFIG_IP_SET_HASH_IPPORTIP=m
210-
CONFIG_IP_SET_HASH_IPPORTNET=m
211-
CONFIG_IP_SET_HASH_NETPORTNET=m
212-
CONFIG_IP_SET_HASH_NET=m
213-
CONFIG_IP_SET_HASH_NETNET=m
214-
CONFIG_IP_SET_HASH_NETPORT=m
215-
CONFIG_IP_SET_HASH_NETIFACE=m
216-
CONFIG_IP_SET_LIST_SET=m
217155
CONFIG_IP_VS=y
218156
CONFIG_IP_VS_IPV6=y
219-
CONFIG_IP_VS_PROTO_TCP=y
220-
CONFIG_IP_VS_PROTO_UDP=y
221-
CONFIG_IP_VS_PROTO_ESP=y
222-
CONFIG_IP_VS_PROTO_AH=y
223-
CONFIG_IP_VS_PROTO_SCTP=y
224157
CONFIG_IP_VS_RR=y
225-
CONFIG_IP_VS_WRR=y
226-
CONFIG_IP_VS_LC=y
227-
CONFIG_IP_VS_WLC=y
228-
CONFIG_IP_VS_LBLC=y
229-
CONFIG_IP_VS_LBLCR=y
230-
CONFIG_IP_VS_DH=y
231-
CONFIG_IP_VS_SH=y
232-
CONFIG_IP_VS_SED=y
233-
CONFIG_IP_VS_NQ=y
234-
CONFIG_IP_VS_FTP=y
235-
CONFIG_IP_VS_PE_SIP=y
158+
CONFIG_IP_VS_NFCT=y
236159
CONFIG_NF_CONNTRACK_IPV4=y
237-
CONFIG_NFT_CHAIN_ROUTE_IPV4=y
238-
CONFIG_NFT_CHAIN_NAT_IPV4=y
239-
CONFIG_NF_TABLES_ARP=y
240160
CONFIG_IP_NF_IPTABLES=y
241161
CONFIG_IP_NF_MATCH_AH=y
242162
CONFIG_IP_NF_MATCH_ECN=y
243-
CONFIG_IP_NF_MATCH_RPFILTER=y
244163
CONFIG_IP_NF_MATCH_TTL=y
245164
CONFIG_IP_NF_FILTER=y
246165
CONFIG_IP_NF_TARGET_REJECT=y
247-
CONFIG_IP_NF_TARGET_SYNPROXY=y
248-
CONFIG_IP_NF_TARGET_ULOG=y
249166
CONFIG_NF_NAT_IPV4=y
250167
CONFIG_IP_NF_TARGET_MASQUERADE=y
168+
CONFIG_BRIDGE_NF_EBTABLES=y
251169
CONFIG_IP_NF_TARGET_NETMAP=y
252170
CONFIG_IP_NF_TARGET_REDIRECT=y
253171
CONFIG_IP_NF_MANGLE=y
254-
CONFIG_IP_NF_TARGET_CLUSTERIP=y
255-
CONFIG_IP_NF_TARGET_ECN=y
256-
CONFIG_IP_NF_TARGET_TTL=y
257172
CONFIG_IP_NF_RAW=y
258-
CONFIG_IP_NF_SECURITY=y
259173
CONFIG_IP_NF_ARPTABLES=y
260174
CONFIG_IP_NF_ARPFILTER=y
261175
CONFIG_IP_NF_ARP_MANGLE=y
262176
CONFIG_NF_CONNTRACK_IPV6=y
263-
CONFIG_NFT_CHAIN_ROUTE_IPV6=y
264-
CONFIG_NFT_CHAIN_NAT_IPV6=y
265-
CONFIG_IP6_NF_MATCH_AH=y
266-
CONFIG_IP6_NF_MATCH_EUI64=y
267-
CONFIG_IP6_NF_MATCH_FRAG=y
268-
CONFIG_IP6_NF_MATCH_OPTS=y
269-
CONFIG_IP6_NF_MATCH_HL=y
270-
CONFIG_IP6_NF_MATCH_IPV6HEADER=y
271-
CONFIG_IP6_NF_MATCH_MH=y
272-
CONFIG_IP6_NF_MATCH_RPFILTER=y
273-
CONFIG_IP6_NF_MATCH_RT=y
274-
CONFIG_IP6_NF_TARGET_HL=y
177+
CONFIG_IP6_NF_IPTABLES=y
275178
CONFIG_IP6_NF_FILTER=y
276179
CONFIG_IP6_NF_TARGET_REJECT=y
277-
CONFIG_IP6_NF_TARGET_SYNPROXY=y
278180
CONFIG_IP6_NF_MANGLE=y
279181
CONFIG_IP6_NF_RAW=y
280-
CONFIG_IP6_NF_SECURITY=y
281182
CONFIG_NF_NAT_IPV6=y
282183
CONFIG_IP6_NF_TARGET_MASQUERADE=y
283184
CONFIG_IP6_NF_TARGET_NPT=y
284-
CONFIG_NF_TABLES_BRIDGE=y
285-
CONFIG_BRIDGE_NF_EBTABLES=y
286-
CONFIG_BRIDGE_EBT_BROUTE=y
287-
CONFIG_BRIDGE_EBT_T_FILTER=y
288-
CONFIG_BRIDGE_EBT_T_NAT=y
289-
CONFIG_BRIDGE_EBT_802_3=y
290-
CONFIG_BRIDGE_EBT_AMONG=y
291-
CONFIG_BRIDGE_EBT_ARP=y
292-
CONFIG_BRIDGE_EBT_IP=y
293-
CONFIG_BRIDGE_EBT_IP6=y
294-
CONFIG_BRIDGE_EBT_LIMIT=y
295-
CONFIG_BRIDGE_EBT_MARK=y
296-
CONFIG_BRIDGE_EBT_PKTTYPE=y
297-
CONFIG_BRIDGE_EBT_STP=y
298-
CONFIG_BRIDGE_EBT_VLAN=y
299-
CONFIG_BRIDGE_EBT_ARPREPLY=y
300-
CONFIG_BRIDGE_EBT_DNAT=y
301-
CONFIG_BRIDGE_EBT_MARK_T=y
302-
CONFIG_BRIDGE_EBT_REDIRECT=y
303-
CONFIG_BRIDGE_EBT_SNAT=y
304-
CONFIG_BRIDGE_EBT_LOG=y
305-
CONFIG_BRIDGE_EBT_ULOG=y
306-
CONFIG_BRIDGE_EBT_NFLOG=y
307185
CONFIG_L2TP=y
308186
CONFIG_L2TP_DEBUGFS=y
309187
CONFIG_L2TP_V3=y

‎lib/mpi/mpi-inline.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define G10_MPI_INLINE_H
3131

3232
#ifndef G10_MPI_INLINE_DECL
33-
#define G10_MPI_INLINE_DECL extern inline
33+
#define G10_MPI_INLINE_DECL inline
3434
#endif
3535

3636
G10_MPI_INLINE_DECL mpi_limb_t

‎lib/mpi/mpi-internal.h

-8
Original file line numberDiff line numberDiff line change
@@ -168,20 +168,12 @@ void mpi_rshift_limbs(MPI a, unsigned int count);
168168
int mpi_lshift_limbs(MPI a, unsigned int count);
169169

170170
/*-- mpihelp-add.c --*/
171-
mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
172-
mpi_size_t s1_size, mpi_limb_t s2_limb);
173171
mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
174172
mpi_ptr_t s2_ptr, mpi_size_t size);
175-
mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
176-
mpi_ptr_t s2_ptr, mpi_size_t s2_size);
177173

178174
/*-- mpihelp-sub.c --*/
179-
mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
180-
mpi_size_t s1_size, mpi_limb_t s2_limb);
181175
mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
182176
mpi_ptr_t s2_ptr, mpi_size_t size);
183-
mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
184-
mpi_ptr_t s2_ptr, mpi_size_t s2_size);
185177

186178
/*-- mpihelp-cmp.c --*/
187179
int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size);

‎mm/memcontrol.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -7113,7 +7113,7 @@ static int mem_cgroup_can_attach(struct cgroup_subsys_state *css,
71137113
static int mem_cgroup_allow_attach(struct cgroup_subsys_state *css,
71147114
struct cgroup_taskset *tset)
71157115
{
7116-
return subsys_cgroup_allow_attach(css->cgroup, tset);
7116+
return subsys_cgroup_allow_attach(css, tset);
71177117
}
71187118

71197119
static void mem_cgroup_cancel_attach(struct cgroup_subsys_state *css,

0 commit comments

Comments
 (0)