Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'm68k-for-v4.9-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fixes from Geert Uytterhoeven:
- build fix for drivers calling ndelay() in a conditional block without
curly braces
- defconfig updates
* tag 'm68k-for-v4.9-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Fix ndelay() macro
m68k/defconfig: Update defconfigs for v4.9-rc1
+73
-25
+6
-2
arch/m68k/configs/amiga_defconfig
+6
-2
arch/m68k/configs/amiga_defconfig
···
95
95
CONFIG_NF_TABLES_NETDEV=m
96
96
CONFIG_NFT_EXTHDR=m
97
97
CONFIG_NFT_META=m
98
+
CONFIG_NFT_NUMGEN=m
98
99
CONFIG_NFT_CT=m
99
-
CONFIG_NFT_RBTREE=m
100
-
CONFIG_NFT_HASH=m
100
+
CONFIG_NFT_SET_RBTREE=m
101
+
CONFIG_NFT_SET_HASH=m
101
102
CONFIG_NFT_COUNTER=m
102
103
CONFIG_NFT_LOG=m
103
104
CONFIG_NFT_LIMIT=m
···
106
105
CONFIG_NFT_REDIR=m
107
106
CONFIG_NFT_NAT=m
108
107
CONFIG_NFT_QUEUE=m
108
+
CONFIG_NFT_QUOTA=m
109
109
CONFIG_NFT_REJECT=m
110
110
CONFIG_NFT_COMPAT=m
111
+
CONFIG_NFT_HASH=m
111
112
CONFIG_NFT_DUP_NETDEV=m
112
113
CONFIG_NFT_FWD_NETDEV=m
113
114
CONFIG_NETFILTER_XT_SET=m
···
369
366
CONFIG_NETCONSOLE_DYNAMIC=y
370
367
CONFIG_VETH=m
371
368
# CONFIG_NET_VENDOR_3COM is not set
369
+
# CONFIG_NET_VENDOR_AMAZON is not set
372
370
CONFIG_A2065=y
373
371
CONFIG_ARIADNE=y
374
372
# CONFIG_NET_VENDOR_ARC is not set
+6
-2
arch/m68k/configs/apollo_defconfig
+6
-2
arch/m68k/configs/apollo_defconfig
···
93
93
CONFIG_NF_TABLES_NETDEV=m
94
94
CONFIG_NFT_EXTHDR=m
95
95
CONFIG_NFT_META=m
96
+
CONFIG_NFT_NUMGEN=m
96
97
CONFIG_NFT_CT=m
97
-
CONFIG_NFT_RBTREE=m
98
-
CONFIG_NFT_HASH=m
98
+
CONFIG_NFT_SET_RBTREE=m
99
+
CONFIG_NFT_SET_HASH=m
99
100
CONFIG_NFT_COUNTER=m
100
101
CONFIG_NFT_LOG=m
101
102
CONFIG_NFT_LIMIT=m
···
104
103
CONFIG_NFT_REDIR=m
105
104
CONFIG_NFT_NAT=m
106
105
CONFIG_NFT_QUEUE=m
106
+
CONFIG_NFT_QUOTA=m
107
107
CONFIG_NFT_REJECT=m
108
108
CONFIG_NFT_COMPAT=m
109
+
CONFIG_NFT_HASH=m
109
110
CONFIG_NFT_DUP_NETDEV=m
110
111
CONFIG_NFT_FWD_NETDEV=m
111
112
CONFIG_NETFILTER_XT_SET=m
···
350
347
CONFIG_NETCONSOLE=m
351
348
CONFIG_NETCONSOLE_DYNAMIC=y
352
349
CONFIG_VETH=m
350
+
# CONFIG_NET_VENDOR_AMAZON is not set
353
351
# CONFIG_NET_VENDOR_ARC is not set
354
352
# CONFIG_NET_CADENCE is not set
355
353
# CONFIG_NET_VENDOR_BROADCOM is not set
+6
-2
arch/m68k/configs/atari_defconfig
+6
-2
arch/m68k/configs/atari_defconfig
···
93
93
CONFIG_NF_TABLES_NETDEV=m
94
94
CONFIG_NFT_EXTHDR=m
95
95
CONFIG_NFT_META=m
96
+
CONFIG_NFT_NUMGEN=m
96
97
CONFIG_NFT_CT=m
97
-
CONFIG_NFT_RBTREE=m
98
-
CONFIG_NFT_HASH=m
98
+
CONFIG_NFT_SET_RBTREE=m
99
+
CONFIG_NFT_SET_HASH=m
99
100
CONFIG_NFT_COUNTER=m
100
101
CONFIG_NFT_LOG=m
101
102
CONFIG_NFT_LIMIT=m
···
104
103
CONFIG_NFT_REDIR=m
105
104
CONFIG_NFT_NAT=m
106
105
CONFIG_NFT_QUEUE=m
106
+
CONFIG_NFT_QUOTA=m
107
107
CONFIG_NFT_REJECT=m
108
108
CONFIG_NFT_COMPAT=m
109
+
CONFIG_NFT_HASH=m
109
110
CONFIG_NFT_DUP_NETDEV=m
110
111
CONFIG_NFT_FWD_NETDEV=m
111
112
CONFIG_NETFILTER_XT_SET=m
···
359
356
CONFIG_NETCONSOLE=m
360
357
CONFIG_NETCONSOLE_DYNAMIC=y
361
358
CONFIG_VETH=m
359
+
# CONFIG_NET_VENDOR_AMAZON is not set
362
360
CONFIG_ATARILANCE=y
363
361
# CONFIG_NET_VENDOR_ARC is not set
364
362
# CONFIG_NET_CADENCE is not set
+6
-2
arch/m68k/configs/bvme6000_defconfig
+6
-2
arch/m68k/configs/bvme6000_defconfig
···
91
91
CONFIG_NF_TABLES_NETDEV=m
92
92
CONFIG_NFT_EXTHDR=m
93
93
CONFIG_NFT_META=m
94
+
CONFIG_NFT_NUMGEN=m
94
95
CONFIG_NFT_CT=m
95
-
CONFIG_NFT_RBTREE=m
96
-
CONFIG_NFT_HASH=m
96
+
CONFIG_NFT_SET_RBTREE=m
97
+
CONFIG_NFT_SET_HASH=m
97
98
CONFIG_NFT_COUNTER=m
98
99
CONFIG_NFT_LOG=m
99
100
CONFIG_NFT_LIMIT=m
···
102
101
CONFIG_NFT_REDIR=m
103
102
CONFIG_NFT_NAT=m
104
103
CONFIG_NFT_QUEUE=m
104
+
CONFIG_NFT_QUOTA=m
105
105
CONFIG_NFT_REJECT=m
106
106
CONFIG_NFT_COMPAT=m
107
+
CONFIG_NFT_HASH=m
107
108
CONFIG_NFT_DUP_NETDEV=m
108
109
CONFIG_NFT_FWD_NETDEV=m
109
110
CONFIG_NETFILTER_XT_SET=m
···
349
346
CONFIG_NETCONSOLE=m
350
347
CONFIG_NETCONSOLE_DYNAMIC=y
351
348
CONFIG_VETH=m
349
+
# CONFIG_NET_VENDOR_AMAZON is not set
352
350
# CONFIG_NET_VENDOR_ARC is not set
353
351
# CONFIG_NET_CADENCE is not set
354
352
# CONFIG_NET_VENDOR_BROADCOM is not set
+6
-2
arch/m68k/configs/hp300_defconfig
+6
-2
arch/m68k/configs/hp300_defconfig
···
93
93
CONFIG_NF_TABLES_NETDEV=m
94
94
CONFIG_NFT_EXTHDR=m
95
95
CONFIG_NFT_META=m
96
+
CONFIG_NFT_NUMGEN=m
96
97
CONFIG_NFT_CT=m
97
-
CONFIG_NFT_RBTREE=m
98
-
CONFIG_NFT_HASH=m
98
+
CONFIG_NFT_SET_RBTREE=m
99
+
CONFIG_NFT_SET_HASH=m
99
100
CONFIG_NFT_COUNTER=m
100
101
CONFIG_NFT_LOG=m
101
102
CONFIG_NFT_LIMIT=m
···
104
103
CONFIG_NFT_REDIR=m
105
104
CONFIG_NFT_NAT=m
106
105
CONFIG_NFT_QUEUE=m
106
+
CONFIG_NFT_QUOTA=m
107
107
CONFIG_NFT_REJECT=m
108
108
CONFIG_NFT_COMPAT=m
109
+
CONFIG_NFT_HASH=m
109
110
CONFIG_NFT_DUP_NETDEV=m
110
111
CONFIG_NFT_FWD_NETDEV=m
111
112
CONFIG_NETFILTER_XT_SET=m
···
350
347
CONFIG_NETCONSOLE=m
351
348
CONFIG_NETCONSOLE_DYNAMIC=y
352
349
CONFIG_VETH=m
350
+
# CONFIG_NET_VENDOR_AMAZON is not set
353
351
CONFIG_HPLANCE=y
354
352
# CONFIG_NET_VENDOR_ARC is not set
355
353
# CONFIG_NET_CADENCE is not set
+6
-2
arch/m68k/configs/mac_defconfig
+6
-2
arch/m68k/configs/mac_defconfig
···
92
92
CONFIG_NF_TABLES_NETDEV=m
93
93
CONFIG_NFT_EXTHDR=m
94
94
CONFIG_NFT_META=m
95
+
CONFIG_NFT_NUMGEN=m
95
96
CONFIG_NFT_CT=m
96
-
CONFIG_NFT_RBTREE=m
97
-
CONFIG_NFT_HASH=m
97
+
CONFIG_NFT_SET_RBTREE=m
98
+
CONFIG_NFT_SET_HASH=m
98
99
CONFIG_NFT_COUNTER=m
99
100
CONFIG_NFT_LOG=m
100
101
CONFIG_NFT_LIMIT=m
···
103
102
CONFIG_NFT_REDIR=m
104
103
CONFIG_NFT_NAT=m
105
104
CONFIG_NFT_QUEUE=m
105
+
CONFIG_NFT_QUOTA=m
106
106
CONFIG_NFT_REJECT=m
107
107
CONFIG_NFT_COMPAT=m
108
+
CONFIG_NFT_HASH=m
108
109
CONFIG_NFT_DUP_NETDEV=m
109
110
CONFIG_NFT_FWD_NETDEV=m
110
111
CONFIG_NETFILTER_XT_SET=m
···
366
363
CONFIG_NETCONSOLE=m
367
364
CONFIG_NETCONSOLE_DYNAMIC=y
368
365
CONFIG_VETH=m
366
+
# CONFIG_NET_VENDOR_AMAZON is not set
369
367
CONFIG_MACMACE=y
370
368
# CONFIG_NET_VENDOR_ARC is not set
371
369
# CONFIG_NET_CADENCE is not set
+6
-2
arch/m68k/configs/multi_defconfig
+6
-2
arch/m68k/configs/multi_defconfig
···
102
102
CONFIG_NF_TABLES_NETDEV=m
103
103
CONFIG_NFT_EXTHDR=m
104
104
CONFIG_NFT_META=m
105
+
CONFIG_NFT_NUMGEN=m
105
106
CONFIG_NFT_CT=m
106
-
CONFIG_NFT_RBTREE=m
107
-
CONFIG_NFT_HASH=m
107
+
CONFIG_NFT_SET_RBTREE=m
108
+
CONFIG_NFT_SET_HASH=m
108
109
CONFIG_NFT_COUNTER=m
109
110
CONFIG_NFT_LOG=m
110
111
CONFIG_NFT_LIMIT=m
···
113
112
CONFIG_NFT_REDIR=m
114
113
CONFIG_NFT_NAT=m
115
114
CONFIG_NFT_QUEUE=m
115
+
CONFIG_NFT_QUOTA=m
116
116
CONFIG_NFT_REJECT=m
117
117
CONFIG_NFT_COMPAT=m
118
+
CONFIG_NFT_HASH=m
118
119
CONFIG_NFT_DUP_NETDEV=m
119
120
CONFIG_NFT_FWD_NETDEV=m
120
121
CONFIG_NETFILTER_XT_SET=m
···
400
397
CONFIG_NETCONSOLE_DYNAMIC=y
401
398
CONFIG_VETH=m
402
399
# CONFIG_NET_VENDOR_3COM is not set
400
+
# CONFIG_NET_VENDOR_AMAZON is not set
403
401
CONFIG_A2065=y
404
402
CONFIG_ARIADNE=y
405
403
CONFIG_ATARILANCE=y
+6
-2
arch/m68k/configs/mvme147_defconfig
+6
-2
arch/m68k/configs/mvme147_defconfig
···
90
90
CONFIG_NF_TABLES_NETDEV=m
91
91
CONFIG_NFT_EXTHDR=m
92
92
CONFIG_NFT_META=m
93
+
CONFIG_NFT_NUMGEN=m
93
94
CONFIG_NFT_CT=m
94
-
CONFIG_NFT_RBTREE=m
95
-
CONFIG_NFT_HASH=m
95
+
CONFIG_NFT_SET_RBTREE=m
96
+
CONFIG_NFT_SET_HASH=m
96
97
CONFIG_NFT_COUNTER=m
97
98
CONFIG_NFT_LOG=m
98
99
CONFIG_NFT_LIMIT=m
···
101
100
CONFIG_NFT_REDIR=m
102
101
CONFIG_NFT_NAT=m
103
102
CONFIG_NFT_QUEUE=m
103
+
CONFIG_NFT_QUOTA=m
104
104
CONFIG_NFT_REJECT=m
105
105
CONFIG_NFT_COMPAT=m
106
+
CONFIG_NFT_HASH=m
106
107
CONFIG_NFT_DUP_NETDEV=m
107
108
CONFIG_NFT_FWD_NETDEV=m
108
109
CONFIG_NETFILTER_XT_SET=m
···
348
345
CONFIG_NETCONSOLE=m
349
346
CONFIG_NETCONSOLE_DYNAMIC=y
350
347
CONFIG_VETH=m
348
+
# CONFIG_NET_VENDOR_AMAZON is not set
351
349
CONFIG_MVME147_NET=y
352
350
# CONFIG_NET_VENDOR_ARC is not set
353
351
# CONFIG_NET_CADENCE is not set
+6
-2
arch/m68k/configs/mvme16x_defconfig
+6
-2
arch/m68k/configs/mvme16x_defconfig
···
91
91
CONFIG_NF_TABLES_NETDEV=m
92
92
CONFIG_NFT_EXTHDR=m
93
93
CONFIG_NFT_META=m
94
+
CONFIG_NFT_NUMGEN=m
94
95
CONFIG_NFT_CT=m
95
-
CONFIG_NFT_RBTREE=m
96
-
CONFIG_NFT_HASH=m
96
+
CONFIG_NFT_SET_RBTREE=m
97
+
CONFIG_NFT_SET_HASH=m
97
98
CONFIG_NFT_COUNTER=m
98
99
CONFIG_NFT_LOG=m
99
100
CONFIG_NFT_LIMIT=m
···
102
101
CONFIG_NFT_REDIR=m
103
102
CONFIG_NFT_NAT=m
104
103
CONFIG_NFT_QUEUE=m
104
+
CONFIG_NFT_QUOTA=m
105
105
CONFIG_NFT_REJECT=m
106
106
CONFIG_NFT_COMPAT=m
107
+
CONFIG_NFT_HASH=m
107
108
CONFIG_NFT_DUP_NETDEV=m
108
109
CONFIG_NFT_FWD_NETDEV=m
109
110
CONFIG_NETFILTER_XT_SET=m
···
349
346
CONFIG_NETCONSOLE=m
350
347
CONFIG_NETCONSOLE_DYNAMIC=y
351
348
CONFIG_VETH=m
349
+
# CONFIG_NET_VENDOR_AMAZON is not set
352
350
# CONFIG_NET_VENDOR_ARC is not set
353
351
# CONFIG_NET_CADENCE is not set
354
352
# CONFIG_NET_VENDOR_BROADCOM is not set
+6
-2
arch/m68k/configs/q40_defconfig
+6
-2
arch/m68k/configs/q40_defconfig
···
91
91
CONFIG_NF_TABLES_NETDEV=m
92
92
CONFIG_NFT_EXTHDR=m
93
93
CONFIG_NFT_META=m
94
+
CONFIG_NFT_NUMGEN=m
94
95
CONFIG_NFT_CT=m
95
-
CONFIG_NFT_RBTREE=m
96
-
CONFIG_NFT_HASH=m
96
+
CONFIG_NFT_SET_RBTREE=m
97
+
CONFIG_NFT_SET_HASH=m
97
98
CONFIG_NFT_COUNTER=m
98
99
CONFIG_NFT_LOG=m
99
100
CONFIG_NFT_LIMIT=m
···
102
101
CONFIG_NFT_REDIR=m
103
102
CONFIG_NFT_NAT=m
104
103
CONFIG_NFT_QUEUE=m
104
+
CONFIG_NFT_QUOTA=m
105
105
CONFIG_NFT_REJECT=m
106
106
CONFIG_NFT_COMPAT=m
107
+
CONFIG_NFT_HASH=m
107
108
CONFIG_NFT_DUP_NETDEV=m
108
109
CONFIG_NFT_FWD_NETDEV=m
109
110
CONFIG_NETFILTER_XT_SET=m
···
356
353
CONFIG_NETCONSOLE_DYNAMIC=y
357
354
CONFIG_VETH=m
358
355
# CONFIG_NET_VENDOR_3COM is not set
356
+
# CONFIG_NET_VENDOR_AMAZON is not set
359
357
# CONFIG_NET_VENDOR_AMD is not set
360
358
# CONFIG_NET_VENDOR_ARC is not set
361
359
# CONFIG_NET_CADENCE is not set
+6
-2
arch/m68k/configs/sun3_defconfig
+6
-2
arch/m68k/configs/sun3_defconfig
···
88
88
CONFIG_NF_TABLES_NETDEV=m
89
89
CONFIG_NFT_EXTHDR=m
90
90
CONFIG_NFT_META=m
91
+
CONFIG_NFT_NUMGEN=m
91
92
CONFIG_NFT_CT=m
92
-
CONFIG_NFT_RBTREE=m
93
-
CONFIG_NFT_HASH=m
93
+
CONFIG_NFT_SET_RBTREE=m
94
+
CONFIG_NFT_SET_HASH=m
94
95
CONFIG_NFT_COUNTER=m
95
96
CONFIG_NFT_LOG=m
96
97
CONFIG_NFT_LIMIT=m
···
99
98
CONFIG_NFT_REDIR=m
100
99
CONFIG_NFT_NAT=m
101
100
CONFIG_NFT_QUEUE=m
101
+
CONFIG_NFT_QUOTA=m
102
102
CONFIG_NFT_REJECT=m
103
103
CONFIG_NFT_COMPAT=m
104
+
CONFIG_NFT_HASH=m
104
105
CONFIG_NFT_DUP_NETDEV=m
105
106
CONFIG_NFT_FWD_NETDEV=m
106
107
CONFIG_NETFILTER_XT_SET=m
···
346
343
CONFIG_NETCONSOLE=m
347
344
CONFIG_NETCONSOLE_DYNAMIC=y
348
345
CONFIG_VETH=m
346
+
# CONFIG_NET_VENDOR_AMAZON is not set
349
347
CONFIG_SUN3LANCE=y
350
348
# CONFIG_NET_VENDOR_ARC is not set
351
349
# CONFIG_NET_CADENCE is not set
+6
-2
arch/m68k/configs/sun3x_defconfig
+6
-2
arch/m68k/configs/sun3x_defconfig
···
88
88
CONFIG_NF_TABLES_NETDEV=m
89
89
CONFIG_NFT_EXTHDR=m
90
90
CONFIG_NFT_META=m
91
+
CONFIG_NFT_NUMGEN=m
91
92
CONFIG_NFT_CT=m
92
-
CONFIG_NFT_RBTREE=m
93
-
CONFIG_NFT_HASH=m
93
+
CONFIG_NFT_SET_RBTREE=m
94
+
CONFIG_NFT_SET_HASH=m
94
95
CONFIG_NFT_COUNTER=m
95
96
CONFIG_NFT_LOG=m
96
97
CONFIG_NFT_LIMIT=m
···
99
98
CONFIG_NFT_REDIR=m
100
99
CONFIG_NFT_NAT=m
101
100
CONFIG_NFT_QUEUE=m
101
+
CONFIG_NFT_QUOTA=m
102
102
CONFIG_NFT_REJECT=m
103
103
CONFIG_NFT_COMPAT=m
104
+
CONFIG_NFT_HASH=m
104
105
CONFIG_NFT_DUP_NETDEV=m
105
106
CONFIG_NFT_FWD_NETDEV=m
106
107
CONFIG_NETFILTER_XT_SET=m
···
346
343
CONFIG_NETCONSOLE=m
347
344
CONFIG_NETCONSOLE_DYNAMIC=y
348
345
CONFIG_VETH=m
346
+
# CONFIG_NET_VENDOR_AMAZON is not set
349
347
CONFIG_SUN3LANCE=y
350
348
# CONFIG_NET_VENDOR_ARC is not set
351
349
# CONFIG_NET_CADENCE is not set
+1
-1
arch/m68k/include/asm/delay.h
+1
-1
arch/m68k/include/asm/delay.h
···
114
114
*/
115
115
#define HZSCALE (268435456 / (1000000 / HZ))
116
116
117
-
#define ndelay(n) __delay(DIV_ROUND_UP((n) * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6), 1000));
117
+
#define ndelay(n) __delay(DIV_ROUND_UP((n) * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6), 1000))
118
118
119
119
#endif /* defined(_M68K_DELAY_H) */