Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit f24279172d610e5ab2b8a2e290490213b0622453

Authored by Linus Torvalds
2 parents 1f8c538ed6 50be9eba83
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y, ti-lsk-linux-4.1.y

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Update defconfigs for v3.14-rc1
  [SCSI] atari_scsi: Fix sleep_on race
  m68k: head.S - Remove bogus L prefix in comment
  m68k: Remove dead code
  m68k: Remove CONSOLE_PENGUIN macro, adopt CONFIG_LOGO

Showing 14 changed files Side-by-side Diff

arch/m68k/configs/amiga_defconfig
Diff comments   View file @ f242791
... ... @@ -24,6 +24,8 @@
24 24 # CONFIG_EFI_PARTITION is not set
25 25 CONFIG_SYSV68_PARTITION=y
26 26 CONFIG_IOSCHED_DEADLINE=m
  27 +CONFIG_KEXEC=y
  28 +CONFIG_BOOTINFO_PROC=y
27 29 CONFIG_M68020=y
28 30 CONFIG_M68030=y
29 31 CONFIG_M68040=y
... ... @@ -85,6 +87,7 @@
85 87 CONFIG_NF_CONNTRACK_SIP=m
86 88 CONFIG_NF_CONNTRACK_TFTP=m
87 89 CONFIG_NF_TABLES=m
  90 +CONFIG_NF_TABLES_INET=m
88 91 CONFIG_NFT_EXTHDR=m
89 92 CONFIG_NFT_META=m
90 93 CONFIG_NFT_CT=m
... ... @@ -94,6 +97,8 @@
94 97 CONFIG_NFT_LOG=m
95 98 CONFIG_NFT_LIMIT=m
96 99 CONFIG_NFT_NAT=m
  100 +CONFIG_NFT_QUEUE=m
  101 +CONFIG_NFT_REJECT=m
97 102 CONFIG_NFT_COMPAT=m
98 103 CONFIG_NETFILTER_XT_SET=m
99 104 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
... ... @@ -126,6 +131,7 @@
126 131 CONFIG_NETFILTER_XT_MATCH_ESP=m
127 132 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
128 133 CONFIG_NETFILTER_XT_MATCH_HELPER=m
  134 +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
129 135 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
130 136 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
131 137 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
... ... @@ -163,8 +169,6 @@
163 169 CONFIG_IP_SET_HASH_NETIFACE=m
164 170 CONFIG_IP_SET_LIST_SET=m
165 171 CONFIG_NF_CONNTRACK_IPV4=m
166   -CONFIG_NF_TABLES_IPV4=m
167   -CONFIG_NFT_REJECT_IPV4=m
168 172 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
169 173 CONFIG_NFT_CHAIN_NAT_IPV4=m
170 174 CONFIG_NF_TABLES_ARP=m
... ... @@ -190,7 +194,6 @@
190 194 CONFIG_IP_NF_ARPFILTER=m
191 195 CONFIG_IP_NF_ARP_MANGLE=m
192 196 CONFIG_NF_CONNTRACK_IPV6=m
193   -CONFIG_NF_TABLES_IPV6=m
194 197 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
195 198 CONFIG_NFT_CHAIN_NAT_IPV6=m
196 199 CONFIG_IP6_NF_IPTABLES=m
... ... @@ -512,7 +515,6 @@
512 515 CONFIG_CRYPTO_USER_API_HASH=m
513 516 CONFIG_CRYPTO_USER_API_SKCIPHER=m
514 517 # CONFIG_CRYPTO_HW is not set
515   -CONFIG_CRC_T10DIF=y
516 518 CONFIG_XZ_DEC_X86=y
517 519 CONFIG_XZ_DEC_POWERPC=y
518 520 CONFIG_XZ_DEC_IA64=y
arch/m68k/configs/apollo_defconfig
Diff comments   View file @ f242791
... ... @@ -25,6 +25,8 @@
25 25 # CONFIG_EFI_PARTITION is not set
26 26 CONFIG_SYSV68_PARTITION=y
27 27 CONFIG_IOSCHED_DEADLINE=m
  28 +CONFIG_KEXEC=y
  29 +CONFIG_BOOTINFO_PROC=y
28 30 CONFIG_M68020=y
29 31 CONFIG_M68030=y
30 32 CONFIG_M68040=y
... ... @@ -83,6 +85,7 @@
83 85 CONFIG_NF_CONNTRACK_SIP=m
84 86 CONFIG_NF_CONNTRACK_TFTP=m
85 87 CONFIG_NF_TABLES=m
  88 +CONFIG_NF_TABLES_INET=m
86 89 CONFIG_NFT_EXTHDR=m
87 90 CONFIG_NFT_META=m
88 91 CONFIG_NFT_CT=m
... ... @@ -92,6 +95,8 @@
92 95 CONFIG_NFT_LOG=m
93 96 CONFIG_NFT_LIMIT=m
94 97 CONFIG_NFT_NAT=m
  98 +CONFIG_NFT_QUEUE=m
  99 +CONFIG_NFT_REJECT=m
95 100 CONFIG_NFT_COMPAT=m
96 101 CONFIG_NETFILTER_XT_SET=m
97 102 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
... ... @@ -124,6 +129,7 @@
124 129 CONFIG_NETFILTER_XT_MATCH_ESP=m
125 130 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
126 131 CONFIG_NETFILTER_XT_MATCH_HELPER=m
  132 +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
127 133 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
128 134 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
129 135 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
... ... @@ -161,8 +167,6 @@
161 167 CONFIG_IP_SET_HASH_NETIFACE=m
162 168 CONFIG_IP_SET_LIST_SET=m
163 169 CONFIG_NF_CONNTRACK_IPV4=m
164   -CONFIG_NF_TABLES_IPV4=m
165   -CONFIG_NFT_REJECT_IPV4=m
166 170 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
167 171 CONFIG_NFT_CHAIN_NAT_IPV4=m
168 172 CONFIG_NF_TABLES_ARP=m
... ... @@ -188,7 +192,6 @@
188 192 CONFIG_IP_NF_ARPFILTER=m
189 193 CONFIG_IP_NF_ARP_MANGLE=m
190 194 CONFIG_NF_CONNTRACK_IPV6=m
191   -CONFIG_NF_TABLES_IPV6=m
192 195 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
193 196 CONFIG_NFT_CHAIN_NAT_IPV6=m
194 197 CONFIG_IP6_NF_IPTABLES=m
... ... @@ -470,7 +473,6 @@
470 473 CONFIG_CRYPTO_USER_API_HASH=m
471 474 CONFIG_CRYPTO_USER_API_SKCIPHER=m
472 475 # CONFIG_CRYPTO_HW is not set
473   -CONFIG_CRC_T10DIF=y
474 476 CONFIG_XZ_DEC_X86=y
475 477 CONFIG_XZ_DEC_POWERPC=y
476 478 CONFIG_XZ_DEC_IA64=y
arch/m68k/configs/atari_defconfig
Diff comments   View file @ f242791
... ... @@ -24,6 +24,8 @@
24 24 # CONFIG_EFI_PARTITION is not set
25 25 CONFIG_SYSV68_PARTITION=y
26 26 CONFIG_IOSCHED_DEADLINE=m
  27 +CONFIG_KEXEC=y
  28 +CONFIG_BOOTINFO_PROC=y
27 29 CONFIG_M68020=y
28 30 CONFIG_M68030=y
29 31 CONFIG_M68040=y
... ... @@ -82,6 +84,7 @@
82 84 CONFIG_NF_CONNTRACK_SIP=m
83 85 CONFIG_NF_CONNTRACK_TFTP=m
84 86 CONFIG_NF_TABLES=m
  87 +CONFIG_NF_TABLES_INET=m
85 88 CONFIG_NFT_EXTHDR=m
86 89 CONFIG_NFT_META=m
87 90 CONFIG_NFT_CT=m
... ... @@ -91,6 +94,8 @@
91 94 CONFIG_NFT_LOG=m
92 95 CONFIG_NFT_LIMIT=m
93 96 CONFIG_NFT_NAT=m
  97 +CONFIG_NFT_QUEUE=m
  98 +CONFIG_NFT_REJECT=m
94 99 CONFIG_NFT_COMPAT=m
95 100 CONFIG_NETFILTER_XT_SET=m
96 101 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
... ... @@ -123,6 +128,7 @@
123 128 CONFIG_NETFILTER_XT_MATCH_ESP=m
124 129 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
125 130 CONFIG_NETFILTER_XT_MATCH_HELPER=m
  131 +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
126 132 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
127 133 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
128 134 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
... ... @@ -160,8 +166,6 @@
160 166 CONFIG_IP_SET_HASH_NETIFACE=m
161 167 CONFIG_IP_SET_LIST_SET=m
162 168 CONFIG_NF_CONNTRACK_IPV4=m
163   -CONFIG_NF_TABLES_IPV4=m
164   -CONFIG_NFT_REJECT_IPV4=m
165 169 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
166 170 CONFIG_NFT_CHAIN_NAT_IPV4=m
167 171 CONFIG_NF_TABLES_ARP=m
... ... @@ -187,7 +191,6 @@
187 191 CONFIG_IP_NF_ARPFILTER=m
188 192 CONFIG_IP_NF_ARP_MANGLE=m
189 193 CONFIG_NF_CONNTRACK_IPV6=m
190   -CONFIG_NF_TABLES_IPV6=m
191 194 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
192 195 CONFIG_NFT_CHAIN_NAT_IPV6=m
193 196 CONFIG_IP6_NF_IPTABLES=m
... ... @@ -487,7 +490,6 @@
487 490 CONFIG_CRYPTO_USER_API_HASH=m
488 491 CONFIG_CRYPTO_USER_API_SKCIPHER=m
489 492 # CONFIG_CRYPTO_HW is not set
490   -CONFIG_CRC_T10DIF=y
491 493 CONFIG_XZ_DEC_X86=y
492 494 CONFIG_XZ_DEC_POWERPC=y
493 495 CONFIG_XZ_DEC_IA64=y
arch/m68k/configs/bvme6000_defconfig
Diff comments   View file @ f242791
... ... @@ -24,6 +24,8 @@
24 24 CONFIG_SUN_PARTITION=y
25 25 # CONFIG_EFI_PARTITION is not set
26 26 CONFIG_IOSCHED_DEADLINE=m
  27 +CONFIG_KEXEC=y
  28 +CONFIG_BOOTINFO_PROC=y
27 29 CONFIG_M68040=y
28 30 CONFIG_M68060=y
29 31 CONFIG_VME=y
... ... @@ -81,6 +83,7 @@
81 83 CONFIG_NF_CONNTRACK_SIP=m
82 84 CONFIG_NF_CONNTRACK_TFTP=m
83 85 CONFIG_NF_TABLES=m
  86 +CONFIG_NF_TABLES_INET=m
84 87 CONFIG_NFT_EXTHDR=m
85 88 CONFIG_NFT_META=m
86 89 CONFIG_NFT_CT=m
... ... @@ -90,6 +93,8 @@
90 93 CONFIG_NFT_LOG=m
91 94 CONFIG_NFT_LIMIT=m
92 95 CONFIG_NFT_NAT=m
  96 +CONFIG_NFT_QUEUE=m
  97 +CONFIG_NFT_REJECT=m
93 98 CONFIG_NFT_COMPAT=m
94 99 CONFIG_NETFILTER_XT_SET=m
95 100 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
... ... @@ -122,6 +127,7 @@
122 127 CONFIG_NETFILTER_XT_MATCH_ESP=m
123 128 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
124 129 CONFIG_NETFILTER_XT_MATCH_HELPER=m
  130 +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
125 131 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
126 132 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
127 133 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
... ... @@ -159,8 +165,6 @@
159 165 CONFIG_IP_SET_HASH_NETIFACE=m
160 166 CONFIG_IP_SET_LIST_SET=m
161 167 CONFIG_NF_CONNTRACK_IPV4=m
162   -CONFIG_NF_TABLES_IPV4=m
163   -CONFIG_NFT_REJECT_IPV4=m
164 168 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
165 169 CONFIG_NFT_CHAIN_NAT_IPV4=m
166 170 CONFIG_NF_TABLES_ARP=m
... ... @@ -186,7 +190,6 @@
186 190 CONFIG_IP_NF_ARPFILTER=m
187 191 CONFIG_IP_NF_ARP_MANGLE=m
188 192 CONFIG_NF_CONNTRACK_IPV6=m
189   -CONFIG_NF_TABLES_IPV6=m
190 193 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
191 194 CONFIG_NFT_CHAIN_NAT_IPV6=m
192 195 CONFIG_IP6_NF_IPTABLES=m
... ... @@ -463,7 +466,6 @@
463 466 CONFIG_CRYPTO_USER_API_HASH=m
464 467 CONFIG_CRYPTO_USER_API_SKCIPHER=m
465 468 # CONFIG_CRYPTO_HW is not set
466   -CONFIG_CRC_T10DIF=y
467 469 CONFIG_XZ_DEC_X86=y
468 470 CONFIG_XZ_DEC_POWERPC=y
469 471 CONFIG_XZ_DEC_IA64=y
arch/m68k/configs/hp300_defconfig
Diff comments   View file @ f242791
... ... @@ -25,6 +25,8 @@
25 25 # CONFIG_EFI_PARTITION is not set
26 26 CONFIG_SYSV68_PARTITION=y
27 27 CONFIG_IOSCHED_DEADLINE=m
  28 +CONFIG_KEXEC=y
  29 +CONFIG_BOOTINFO_PROC=y
28 30 CONFIG_M68020=y
29 31 CONFIG_M68030=y
30 32 CONFIG_M68040=y
... ... @@ -83,6 +85,7 @@
83 85 CONFIG_NF_CONNTRACK_SIP=m
84 86 CONFIG_NF_CONNTRACK_TFTP=m
85 87 CONFIG_NF_TABLES=m
  88 +CONFIG_NF_TABLES_INET=m
86 89 CONFIG_NFT_EXTHDR=m
87 90 CONFIG_NFT_META=m
88 91 CONFIG_NFT_CT=m
... ... @@ -92,6 +95,8 @@
92 95 CONFIG_NFT_LOG=m
93 96 CONFIG_NFT_LIMIT=m
94 97 CONFIG_NFT_NAT=m
  98 +CONFIG_NFT_QUEUE=m
  99 +CONFIG_NFT_REJECT=m
95 100 CONFIG_NFT_COMPAT=m
96 101 CONFIG_NETFILTER_XT_SET=m
97 102 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
... ... @@ -124,6 +129,7 @@
124 129 CONFIG_NETFILTER_XT_MATCH_ESP=m
125 130 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
126 131 CONFIG_NETFILTER_XT_MATCH_HELPER=m
  132 +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
127 133 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
128 134 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
129 135 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
... ... @@ -161,8 +167,6 @@
161 167 CONFIG_IP_SET_HASH_NETIFACE=m
162 168 CONFIG_IP_SET_LIST_SET=m
163 169 CONFIG_NF_CONNTRACK_IPV4=m
164   -CONFIG_NF_TABLES_IPV4=m
165   -CONFIG_NFT_REJECT_IPV4=m
166 170 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
167 171 CONFIG_NFT_CHAIN_NAT_IPV4=m
168 172 CONFIG_NF_TABLES_ARP=m
... ... @@ -188,7 +192,6 @@
188 192 CONFIG_IP_NF_ARPFILTER=m
189 193 CONFIG_IP_NF_ARP_MANGLE=m
190 194 CONFIG_NF_CONNTRACK_IPV6=m
191   -CONFIG_NF_TABLES_IPV6=m
192 195 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
193 196 CONFIG_NFT_CHAIN_NAT_IPV6=m
194 197 CONFIG_IP6_NF_IPTABLES=m
... ... @@ -472,7 +475,6 @@
472 475 CONFIG_CRYPTO_USER_API_HASH=m
473 476 CONFIG_CRYPTO_USER_API_SKCIPHER=m
474 477 # CONFIG_CRYPTO_HW is not set
475   -CONFIG_CRC_T10DIF=y
476 478 CONFIG_XZ_DEC_X86=y
477 479 CONFIG_XZ_DEC_POWERPC=y
478 480 CONFIG_XZ_DEC_IA64=y
arch/m68k/configs/mac_defconfig
Diff comments   View file @ f242791
... ... @@ -24,6 +24,8 @@
24 24 # CONFIG_EFI_PARTITION is not set
25 25 CONFIG_SYSV68_PARTITION=y
26 26 CONFIG_IOSCHED_DEADLINE=m
  27 +CONFIG_KEXEC=y
  28 +CONFIG_BOOTINFO_PROC=y
27 29 CONFIG_M68020=y
28 30 CONFIG_M68030=y
29 31 CONFIG_M68040=y
... ... @@ -82,6 +84,7 @@
82 84 CONFIG_NF_CONNTRACK_SIP=m
83 85 CONFIG_NF_CONNTRACK_TFTP=m
84 86 CONFIG_NF_TABLES=m
  87 +CONFIG_NF_TABLES_INET=m
85 88 CONFIG_NFT_EXTHDR=m
86 89 CONFIG_NFT_META=m
87 90 CONFIG_NFT_CT=m
... ... @@ -91,6 +94,8 @@
91 94 CONFIG_NFT_LOG=m
92 95 CONFIG_NFT_LIMIT=m
93 96 CONFIG_NFT_NAT=m
  97 +CONFIG_NFT_QUEUE=m
  98 +CONFIG_NFT_REJECT=m
94 99 CONFIG_NFT_COMPAT=m
95 100 CONFIG_NETFILTER_XT_SET=m
96 101 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
... ... @@ -123,6 +128,7 @@
123 128 CONFIG_NETFILTER_XT_MATCH_ESP=m
124 129 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
125 130 CONFIG_NETFILTER_XT_MATCH_HELPER=m
  131 +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
126 132 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
127 133 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
128 134 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
... ... @@ -160,8 +166,6 @@
160 166 CONFIG_IP_SET_HASH_NETIFACE=m
161 167 CONFIG_IP_SET_LIST_SET=m
162 168 CONFIG_NF_CONNTRACK_IPV4=m
163   -CONFIG_NF_TABLES_IPV4=m
164   -CONFIG_NFT_REJECT_IPV4=m
165 169 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
166 170 CONFIG_NFT_CHAIN_NAT_IPV4=m
167 171 CONFIG_NF_TABLES_ARP=m
... ... @@ -187,7 +191,6 @@
187 191 CONFIG_IP_NF_ARPFILTER=m
188 192 CONFIG_IP_NF_ARP_MANGLE=m
189 193 CONFIG_NF_CONNTRACK_IPV6=m
190   -CONFIG_NF_TABLES_IPV6=m
191 194 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
192 195 CONFIG_NFT_CHAIN_NAT_IPV6=m
193 196 CONFIG_IP6_NF_IPTABLES=m
... ... @@ -495,7 +498,6 @@
495 498 CONFIG_CRYPTO_USER_API_HASH=m
496 499 CONFIG_CRYPTO_USER_API_SKCIPHER=m
497 500 # CONFIG_CRYPTO_HW is not set
498   -CONFIG_CRC_T10DIF=y
499 501 CONFIG_XZ_DEC_X86=y
500 502 CONFIG_XZ_DEC_POWERPC=y
501 503 CONFIG_XZ_DEC_IA64=y
arch/m68k/configs/multi_defconfig
Diff comments   View file @ f242791
... ... @@ -20,6 +20,8 @@
20 20 CONFIG_UNIXWARE_DISKLABEL=y
21 21 # CONFIG_EFI_PARTITION is not set
22 22 CONFIG_IOSCHED_DEADLINE=m
  23 +CONFIG_KEXEC=y
  24 +CONFIG_BOOTINFO_PROC=y
23 25 CONFIG_M68020=y
24 26 CONFIG_M68040=y
25 27 CONFIG_M68060=y
... ... @@ -91,6 +93,7 @@
91 93 CONFIG_NF_CONNTRACK_SIP=m
92 94 CONFIG_NF_CONNTRACK_TFTP=m
93 95 CONFIG_NF_TABLES=m
  96 +CONFIG_NF_TABLES_INET=m
94 97 CONFIG_NFT_EXTHDR=m
95 98 CONFIG_NFT_META=m
96 99 CONFIG_NFT_CT=m
... ... @@ -100,6 +103,8 @@
100 103 CONFIG_NFT_LOG=m
101 104 CONFIG_NFT_LIMIT=m
102 105 CONFIG_NFT_NAT=m
  106 +CONFIG_NFT_QUEUE=m
  107 +CONFIG_NFT_REJECT=m
103 108 CONFIG_NFT_COMPAT=m
104 109 CONFIG_NETFILTER_XT_SET=m
105 110 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
... ... @@ -132,6 +137,7 @@
132 137 CONFIG_NETFILTER_XT_MATCH_ESP=m
133 138 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
134 139 CONFIG_NETFILTER_XT_MATCH_HELPER=m
  140 +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
135 141 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
136 142 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
137 143 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
... ... @@ -169,8 +175,6 @@
169 175 CONFIG_IP_SET_HASH_NETIFACE=m
170 176 CONFIG_IP_SET_LIST_SET=m
171 177 CONFIG_NF_CONNTRACK_IPV4=m
172   -CONFIG_NF_TABLES_IPV4=m
173   -CONFIG_NFT_REJECT_IPV4=m
174 178 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
175 179 CONFIG_NFT_CHAIN_NAT_IPV4=m
176 180 CONFIG_NF_TABLES_ARP=m
... ... @@ -196,7 +200,6 @@
196 200 CONFIG_IP_NF_ARPFILTER=m
197 201 CONFIG_IP_NF_ARP_MANGLE=m
198 202 CONFIG_NF_CONNTRACK_IPV6=m
199   -CONFIG_NF_TABLES_IPV6=m
200 203 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
201 204 CONFIG_NFT_CHAIN_NAT_IPV6=m
202 205 CONFIG_IP6_NF_IPTABLES=m
... ... @@ -571,7 +574,6 @@
571 574 CONFIG_CRYPTO_USER_API_HASH=m
572 575 CONFIG_CRYPTO_USER_API_SKCIPHER=m
573 576 # CONFIG_CRYPTO_HW is not set
574   -CONFIG_CRC_T10DIF=y
575 577 CONFIG_XZ_DEC_X86=y
576 578 CONFIG_XZ_DEC_POWERPC=y
577 579 CONFIG_XZ_DEC_IA64=y
arch/m68k/configs/mvme147_defconfig
Diff comments   View file @ f242791
... ... @@ -24,6 +24,8 @@
24 24 CONFIG_SUN_PARTITION=y
25 25 # CONFIG_EFI_PARTITION is not set
26 26 CONFIG_IOSCHED_DEADLINE=m
  27 +CONFIG_KEXEC=y
  28 +CONFIG_BOOTINFO_PROC=y
27 29 CONFIG_M68030=y
28 30 CONFIG_VME=y
29 31 CONFIG_MVME147=y
... ... @@ -80,6 +82,7 @@
80 82 CONFIG_NF_CONNTRACK_SIP=m
81 83 CONFIG_NF_CONNTRACK_TFTP=m
82 84 CONFIG_NF_TABLES=m
  85 +CONFIG_NF_TABLES_INET=m
83 86 CONFIG_NFT_EXTHDR=m
84 87 CONFIG_NFT_META=m
85 88 CONFIG_NFT_CT=m
... ... @@ -89,6 +92,8 @@
89 92 CONFIG_NFT_LOG=m
90 93 CONFIG_NFT_LIMIT=m
91 94 CONFIG_NFT_NAT=m
  95 +CONFIG_NFT_QUEUE=m
  96 +CONFIG_NFT_REJECT=m
92 97 CONFIG_NFT_COMPAT=m
93 98 CONFIG_NETFILTER_XT_SET=m
94 99 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
... ... @@ -121,6 +126,7 @@
121 126 CONFIG_NETFILTER_XT_MATCH_ESP=m
122 127 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
123 128 CONFIG_NETFILTER_XT_MATCH_HELPER=m
  129 +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
124 130 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
125 131 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
126 132 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
... ... @@ -158,8 +164,6 @@
158 164 CONFIG_IP_SET_HASH_NETIFACE=m
159 165 CONFIG_IP_SET_LIST_SET=m
160 166 CONFIG_NF_CONNTRACK_IPV4=m
161   -CONFIG_NF_TABLES_IPV4=m
162   -CONFIG_NFT_REJECT_IPV4=m
163 167 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
164 168 CONFIG_NFT_CHAIN_NAT_IPV4=m
165 169 CONFIG_NF_TABLES_ARP=m
... ... @@ -185,7 +189,6 @@
185 189 CONFIG_IP_NF_ARPFILTER=m
186 190 CONFIG_IP_NF_ARP_MANGLE=m
187 191 CONFIG_NF_CONNTRACK_IPV6=m
188   -CONFIG_NF_TABLES_IPV6=m
189 192 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
190 193 CONFIG_NFT_CHAIN_NAT_IPV6=m
191 194 CONFIG_IP6_NF_IPTABLES=m
... ... @@ -463,7 +466,6 @@
463 466 CONFIG_CRYPTO_USER_API_HASH=m
464 467 CONFIG_CRYPTO_USER_API_SKCIPHER=m
465 468 # CONFIG_CRYPTO_HW is not set
466   -CONFIG_CRC_T10DIF=y
467 469 CONFIG_XZ_DEC_X86=y
468 470 CONFIG_XZ_DEC_POWERPC=y
469 471 CONFIG_XZ_DEC_IA64=y
arch/m68k/configs/mvme16x_defconfig
Diff comments   View file @ f242791
... ... @@ -24,6 +24,8 @@
24 24 CONFIG_SUN_PARTITION=y
25 25 # CONFIG_EFI_PARTITION is not set
26 26 CONFIG_IOSCHED_DEADLINE=m
  27 +CONFIG_KEXEC=y
  28 +CONFIG_BOOTINFO_PROC=y
27 29 CONFIG_M68040=y
28 30 CONFIG_M68060=y
29 31 CONFIG_VME=y
... ... @@ -81,6 +83,7 @@
81 83 CONFIG_NF_CONNTRACK_SIP=m
82 84 CONFIG_NF_CONNTRACK_TFTP=m
83 85 CONFIG_NF_TABLES=m
  86 +CONFIG_NF_TABLES_INET=m
84 87 CONFIG_NFT_EXTHDR=m
85 88 CONFIG_NFT_META=m
86 89 CONFIG_NFT_CT=m
... ... @@ -90,6 +93,8 @@
90 93 CONFIG_NFT_LOG=m
91 94 CONFIG_NFT_LIMIT=m
92 95 CONFIG_NFT_NAT=m
  96 +CONFIG_NFT_QUEUE=m
  97 +CONFIG_NFT_REJECT=m
93 98 CONFIG_NFT_COMPAT=m
94 99 CONFIG_NETFILTER_XT_SET=m
95 100 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
... ... @@ -122,6 +127,7 @@
122 127 CONFIG_NETFILTER_XT_MATCH_ESP=m
123 128 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
124 129 CONFIG_NETFILTER_XT_MATCH_HELPER=m
  130 +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
125 131 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
126 132 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
127 133 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
... ... @@ -159,8 +165,6 @@
159 165 CONFIG_IP_SET_HASH_NETIFACE=m
160 166 CONFIG_IP_SET_LIST_SET=m
161 167 CONFIG_NF_CONNTRACK_IPV4=m
162   -CONFIG_NF_TABLES_IPV4=m
163   -CONFIG_NFT_REJECT_IPV4=m
164 168 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
165 169 CONFIG_NFT_CHAIN_NAT_IPV4=m
166 170 CONFIG_NF_TABLES_ARP=m
... ... @@ -186,7 +190,6 @@
186 190 CONFIG_IP_NF_ARPFILTER=m
187 191 CONFIG_IP_NF_ARP_MANGLE=m
188 192 CONFIG_NF_CONNTRACK_IPV6=m
189   -CONFIG_NF_TABLES_IPV6=m
190 193 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
191 194 CONFIG_NFT_CHAIN_NAT_IPV6=m
192 195 CONFIG_IP6_NF_IPTABLES=m
... ... @@ -464,7 +467,6 @@
464 467 CONFIG_CRYPTO_USER_API_HASH=m
465 468 CONFIG_CRYPTO_USER_API_SKCIPHER=m
466 469 # CONFIG_CRYPTO_HW is not set
467   -CONFIG_CRC_T10DIF=y
468 470 CONFIG_XZ_DEC_X86=y
469 471 CONFIG_XZ_DEC_POWERPC=y
470 472 CONFIG_XZ_DEC_IA64=y
arch/m68k/configs/q40_defconfig
Diff comments   View file @ f242791
... ... @@ -25,6 +25,8 @@
25 25 # CONFIG_EFI_PARTITION is not set
26 26 CONFIG_SYSV68_PARTITION=y
27 27 CONFIG_IOSCHED_DEADLINE=m
  28 +CONFIG_KEXEC=y
  29 +CONFIG_BOOTINFO_PROC=y
28 30 CONFIG_M68040=y
29 31 CONFIG_M68060=y
30 32 CONFIG_Q40=y
... ... @@ -81,6 +83,7 @@
81 83 CONFIG_NF_CONNTRACK_SIP=m
82 84 CONFIG_NF_CONNTRACK_TFTP=m
83 85 CONFIG_NF_TABLES=m
  86 +CONFIG_NF_TABLES_INET=m
84 87 CONFIG_NFT_EXTHDR=m
85 88 CONFIG_NFT_META=m
86 89 CONFIG_NFT_CT=m
... ... @@ -90,6 +93,8 @@
90 93 CONFIG_NFT_LOG=m
91 94 CONFIG_NFT_LIMIT=m
92 95 CONFIG_NFT_NAT=m
  96 +CONFIG_NFT_QUEUE=m
  97 +CONFIG_NFT_REJECT=m
93 98 CONFIG_NFT_COMPAT=m
94 99 CONFIG_NETFILTER_XT_SET=m
95 100 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
... ... @@ -122,6 +127,7 @@
122 127 CONFIG_NETFILTER_XT_MATCH_ESP=m
123 128 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
124 129 CONFIG_NETFILTER_XT_MATCH_HELPER=m
  130 +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
125 131 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
126 132 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
127 133 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
... ... @@ -159,8 +165,6 @@
159 165 CONFIG_IP_SET_HASH_NETIFACE=m
160 166 CONFIG_IP_SET_LIST_SET=m
161 167 CONFIG_NF_CONNTRACK_IPV4=m
162   -CONFIG_NF_TABLES_IPV4=m
163   -CONFIG_NFT_REJECT_IPV4=m
164 168 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
165 169 CONFIG_NFT_CHAIN_NAT_IPV4=m
166 170 CONFIG_NF_TABLES_ARP=m
... ... @@ -186,7 +190,6 @@
186 190 CONFIG_IP_NF_ARPFILTER=m
187 191 CONFIG_IP_NF_ARP_MANGLE=m
188 192 CONFIG_NF_CONNTRACK_IPV6=m
189   -CONFIG_NF_TABLES_IPV6=m
190 193 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
191 194 CONFIG_NFT_CHAIN_NAT_IPV6=m
192 195 CONFIG_IP6_NF_IPTABLES=m
... ... @@ -485,7 +488,6 @@
485 488 CONFIG_CRYPTO_USER_API_HASH=m
486 489 CONFIG_CRYPTO_USER_API_SKCIPHER=m
487 490 # CONFIG_CRYPTO_HW is not set
488   -CONFIG_CRC_T10DIF=y
489 491 CONFIG_XZ_DEC_X86=y
490 492 CONFIG_XZ_DEC_POWERPC=y
491 493 CONFIG_XZ_DEC_IA64=y
arch/m68k/configs/sun3_defconfig
Diff comments   View file @ f242791
... ... @@ -24,6 +24,8 @@
24 24 # CONFIG_EFI_PARTITION is not set
25 25 CONFIG_SYSV68_PARTITION=y
26 26 CONFIG_IOSCHED_DEADLINE=m
  27 +CONFIG_KEXEC=y
  28 +CONFIG_BOOTINFO_PROC=y
27 29 CONFIG_SUN3=y
28 30 # CONFIG_COMPACTION is not set
29 31 CONFIG_CLEANCACHE=y
... ... @@ -78,6 +80,7 @@
78 80 CONFIG_NF_CONNTRACK_SIP=m
79 81 CONFIG_NF_CONNTRACK_TFTP=m
80 82 CONFIG_NF_TABLES=m
  83 +CONFIG_NF_TABLES_INET=m
81 84 CONFIG_NFT_EXTHDR=m
82 85 CONFIG_NFT_META=m
83 86 CONFIG_NFT_CT=m
... ... @@ -87,6 +90,8 @@
87 90 CONFIG_NFT_LOG=m
88 91 CONFIG_NFT_LIMIT=m
89 92 CONFIG_NFT_NAT=m
  93 +CONFIG_NFT_QUEUE=m
  94 +CONFIG_NFT_REJECT=m
90 95 CONFIG_NFT_COMPAT=m
91 96 CONFIG_NETFILTER_XT_SET=m
92 97 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
... ... @@ -119,6 +124,7 @@
119 124 CONFIG_NETFILTER_XT_MATCH_ESP=m
120 125 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
121 126 CONFIG_NETFILTER_XT_MATCH_HELPER=m
  127 +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
122 128 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
123 129 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
124 130 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
... ... @@ -156,8 +162,6 @@
156 162 CONFIG_IP_SET_HASH_NETIFACE=m
157 163 CONFIG_IP_SET_LIST_SET=m
158 164 CONFIG_NF_CONNTRACK_IPV4=m
159   -CONFIG_NF_TABLES_IPV4=m
160   -CONFIG_NFT_REJECT_IPV4=m
161 165 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
162 166 CONFIG_NFT_CHAIN_NAT_IPV4=m
163 167 CONFIG_NF_TABLES_ARP=m
... ... @@ -183,7 +187,6 @@
183 187 CONFIG_IP_NF_ARPFILTER=m
184 188 CONFIG_IP_NF_ARP_MANGLE=m
185 189 CONFIG_NF_CONNTRACK_IPV6=m
186   -CONFIG_NF_TABLES_IPV6=m
187 190 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
188 191 CONFIG_NFT_CHAIN_NAT_IPV6=m
189 192 CONFIG_IP6_NF_IPTABLES=m
... ... @@ -464,7 +467,6 @@
464 467 CONFIG_CRYPTO_USER_API_HASH=m
465 468 CONFIG_CRYPTO_USER_API_SKCIPHER=m
466 469 # CONFIG_CRYPTO_HW is not set
467   -CONFIG_CRC_T10DIF=y
468 470 CONFIG_XZ_DEC_X86=y
469 471 CONFIG_XZ_DEC_POWERPC=y
470 472 CONFIG_XZ_DEC_IA64=y
arch/m68k/configs/sun3x_defconfig
Diff comments   View file @ f242791
... ... @@ -24,6 +24,8 @@
24 24 # CONFIG_EFI_PARTITION is not set
25 25 CONFIG_SYSV68_PARTITION=y
26 26 CONFIG_IOSCHED_DEADLINE=m
  27 +CONFIG_KEXEC=y
  28 +CONFIG_BOOTINFO_PROC=y
27 29 CONFIG_SUN3X=y
28 30 # CONFIG_COMPACTION is not set
29 31 CONFIG_CLEANCACHE=y
... ... @@ -78,6 +80,7 @@
78 80 CONFIG_NF_CONNTRACK_SIP=m
79 81 CONFIG_NF_CONNTRACK_TFTP=m
80 82 CONFIG_NF_TABLES=m
  83 +CONFIG_NF_TABLES_INET=m
81 84 CONFIG_NFT_EXTHDR=m
82 85 CONFIG_NFT_META=m
83 86 CONFIG_NFT_CT=m
... ... @@ -87,6 +90,8 @@
87 90 CONFIG_NFT_LOG=m
88 91 CONFIG_NFT_LIMIT=m
89 92 CONFIG_NFT_NAT=m
  93 +CONFIG_NFT_QUEUE=m
  94 +CONFIG_NFT_REJECT=m
90 95 CONFIG_NFT_COMPAT=m
91 96 CONFIG_NETFILTER_XT_SET=m
92 97 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
... ... @@ -119,6 +124,7 @@
119 124 CONFIG_NETFILTER_XT_MATCH_ESP=m
120 125 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
121 126 CONFIG_NETFILTER_XT_MATCH_HELPER=m
  127 +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
122 128 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
123 129 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
124 130 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
... ... @@ -156,8 +162,6 @@
156 162 CONFIG_IP_SET_HASH_NETIFACE=m
157 163 CONFIG_IP_SET_LIST_SET=m
158 164 CONFIG_NF_CONNTRACK_IPV4=m
159   -CONFIG_NF_TABLES_IPV4=m
160   -CONFIG_NFT_REJECT_IPV4=m
161 165 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
162 166 CONFIG_NFT_CHAIN_NAT_IPV4=m
163 167 CONFIG_NF_TABLES_ARP=m
... ... @@ -183,7 +187,6 @@
183 187 CONFIG_IP_NF_ARPFILTER=m
184 188 CONFIG_IP_NF_ARP_MANGLE=m
185 189 CONFIG_NF_CONNTRACK_IPV6=m
186   -CONFIG_NF_TABLES_IPV6=m
187 190 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
188 191 CONFIG_NFT_CHAIN_NAT_IPV6=m
189 192 CONFIG_IP6_NF_IPTABLES=m
... ... @@ -464,7 +467,6 @@
464 467 CONFIG_CRYPTO_USER_API_HASH=m
465 468 CONFIG_CRYPTO_USER_API_SKCIPHER=m
466 469 # CONFIG_CRYPTO_HW is not set
467   -CONFIG_CRC_T10DIF=y
468 470 CONFIG_XZ_DEC_X86=y
469 471 CONFIG_XZ_DEC_POWERPC=y
470 472 CONFIG_XZ_DEC_IA64=y
arch/m68k/kernel/head.S
Diff comments   View file @ f242791
... ... @@ -275,7 +275,6 @@
275 275  
276 276 #ifdef CONFIG_FRAMEBUFFER_CONSOLE
277 277 #define CONSOLE
278   -#define CONSOLE_PENGUIN
279 278 #endif
280 279  
281 280 #ifdef CONFIG_EARLY_PRINTK
... ... @@ -658,27 +657,6 @@
658 657 movel %a0@,%a1@
659 658 #endif
660 659  
661   -#if 0
662   - /*
663   - * Clear the screen
664   - */
665   - lea %pc@(L(mac_videobase)),%a0
666   - movel %a0@,%a1
667   - lea %pc@(L(mac_dimensions)),%a0
668   - movel %a0@,%d1
669   - swap %d1 /* #rows is high bytes */
670   - andl #0xFFFF,%d1 /* rows */
671   - subl #10,%d1
672   - lea %pc@(L(mac_rowbytes)),%a0
673   -loopy2:
674   - movel %a0@,%d0
675   - subql #1,%d0
676   -loopx2:
677   - moveb #0x55, %a1@+
678   - dbra %d0,loopx2
679   - dbra %d1,loopy2
680   -#endif
681   -
682 660 L(test_notmac):
683 661 #endif /* CONFIG_MAC */
684 662  
685 663  
686 664  
687 665  
688 666  
... ... @@ -907,15 +885,15 @@
907 885 */
908 886 #ifdef CONFIG_MAC
909 887 is_not_mac(L(nocon))
910   -#ifdef CONSOLE
  888 +# ifdef CONSOLE
911 889 console_init
912   -#ifdef CONSOLE_PENGUIN
  890 +# ifdef CONFIG_LOGO
913 891 console_put_penguin
914   -#endif /* CONSOLE_PENGUIN */
  892 +# endif /* CONFIG_LOGO */
915 893 console_put_stats
916   -#endif /* CONSOLE */
  894 +# endif /* CONSOLE */
917 895 L(nocon):
918   -#endif /* CONFIG_MAC */
  896 +#endif /* CONFIG_MAC */
919 897  
920 898  
921 899 putc '\n'
922 900  
... ... @@ -3324,14 +3302,13 @@
3324 3302 #define Lconsole_struct_num_columns 8
3325 3303 #define Lconsole_struct_num_rows 12
3326 3304 #define Lconsole_struct_left_edge 16
3327   -#define Lconsole_struct_penguin_putc 20
3328 3305  
3329 3306 func_start console_init,%a0-%a4/%d0-%d7
3330 3307 /*
3331 3308 * Some of the register usage that follows
3332 3309 * a0 = pointer to boot_info
3333 3310 * a1 = pointer to screen
3334   - * a2 = pointer to Lconsole_globals
  3311 + * a2 = pointer to console_globals
3335 3312 * d3 = pixel width of screen
3336 3313 * d4 = pixel height of screen
3337 3314 * (d3,d4) ~= (x,y) of a point just below
... ... @@ -3456,7 +3433,7 @@
3456 3433  
3457 3434 func_return console_put_stats
3458 3435  
3459   -#ifdef CONSOLE_PENGUIN
  3436 +#ifdef CONFIG_LOGO
3460 3437 func_start console_put_penguin,%a0-%a1/%d0-%d7
3461 3438 /*
3462 3439 * Get 'that_penguin' onto the screen in the upper right corner
3463 3440  
... ... @@ -3799,39 +3776,7 @@
3799 3776 func_return console_plot_pixel
3800 3777 #endif /* CONSOLE */
3801 3778  
3802   -#if 0
3803   -/*
3804   - * This is some old code lying around. I don't believe
3805   - * it's used or important anymore. My guess is it contributed
3806   - * to getting to this point, but it's done for now.
3807   - * It was still in the 2.1.77 head.S, so it's still here.
3808   - * (And still not used!)
3809   - */
3810   -L(showtest):
3811   - moveml %a0/%d7,%sp@-
3812   - puts "A="
3813   - putn %a1
3814 3779  
3815   - .long 0xf0119f15 | ptestr #5,%a1@,#7,%a0
3816   -
3817   - puts "DA="
3818   - putn %a0
3819   -
3820   - puts "D="
3821   - putn %a0@
3822   -
3823   - puts "S="
3824   - lea %pc@(L(mmu)),%a0
3825   - .long 0xf0106200 | pmove %psr,%a0@
3826   - clrl %d7
3827   - movew %a0@,%d7
3828   - putn %d7
3829   -
3830   - putc '\n'
3831   - moveml %sp@+,%a0/%d7
3832   - rts
3833   -#endif /* 0 */
3834   -
3835 3780 __INITDATA
3836 3781 .align 4
3837 3782  
... ... @@ -3849,7 +3794,6 @@
3849 3794 .long 0 /* max num columns */
3850 3795 .long 0 /* max num rows */
3851 3796 .long 0 /* left edge */
3852   - .long 0 /* mac putc */
3853 3797 L(console_font):
3854 3798 .long 0 /* pointer to console font (struct font_desc) */
3855 3799 L(console_font_data):
drivers/scsi/atari_scsi.c
Diff comments   View file @ f242791
... ... @@ -90,6 +90,7 @@
90 90 #include <linux/init.h>
91 91 #include <linux/nvram.h>
92 92 #include <linux/bitops.h>
  93 +#include <linux/wait.h>
93 94  
94 95 #include <asm/setup.h>
95 96 #include <asm/atarihw.h>
... ... @@ -549,8 +550,10 @@
549 550  
550 551 local_irq_save(flags);
551 552  
552   - while (!in_irq() && falcon_got_lock && stdma_others_waiting())
553   - sleep_on(&falcon_fairness_wait);
  553 + wait_event_cmd(falcon_fairness_wait,
  554 + in_interrupt() || !falcon_got_lock || !stdma_others_waiting(),
  555 + local_irq_restore(flags),
  556 + local_irq_save(flags));
554 557  
555 558 while (!falcon_got_lock) {
556 559 if (in_irq())
... ... @@ -562,7 +565,10 @@
562 565 falcon_trying_lock = 0;
563 566 wake_up(&falcon_try_wait);
564 567 } else {
565   - sleep_on(&falcon_try_wait);
  568 + wait_event_cmd(falcon_try_wait,
  569 + falcon_got_lock && !falcon_trying_lock,
  570 + local_irq_restore(flags),
  571 + local_irq_save(flags));
566 572 }
567 573 }
568 574