tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'm68k-for-v6.18-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:

- Fix whitespace in Zorro name macros

- Fix find_*_bit() signatures

- defconfig updates

* tag 'm68k-for-v6.18-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: defconfig: Update defconfigs for v6.17-rc1
m68k: bitops: Fix find_*_bit() signatures
zorro: Remove extra whitespace in macro definitions

Linus Torvalds f1004b2f cb7e3669

+56 -89
+3 -6
arch/m68k/configs/amiga_defconfig
··· 125 125 CONFIG_NFT_REJECT_NETDEV=m 126 126 CONFIG_NF_FLOW_TABLE_INET=m 127 127 CONFIG_NF_FLOW_TABLE=m 128 + CONFIG_NETFILTER_XTABLES_LEGACY=y 128 129 CONFIG_NETFILTER_XT_SET=m 129 130 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 130 131 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m ··· 207 206 CONFIG_IP_NF_MATCH_ECN=m 208 207 CONFIG_IP_NF_MATCH_RPFILTER=m 209 208 CONFIG_IP_NF_MATCH_TTL=m 210 - CONFIG_IP_NF_FILTER=m 211 209 CONFIG_IP_NF_TARGET_REJECT=m 212 210 CONFIG_IP_NF_TARGET_SYNPROXY=m 213 211 CONFIG_IP_NF_NAT=m 214 212 CONFIG_IP_NF_TARGET_MASQUERADE=m 215 213 CONFIG_IP_NF_TARGET_NETMAP=m 216 214 CONFIG_IP_NF_TARGET_REDIRECT=m 217 - CONFIG_IP_NF_MANGLE=m 218 215 CONFIG_IP_NF_TARGET_ECN=m 219 216 CONFIG_IP_NF_TARGET_TTL=m 220 217 CONFIG_IP_NF_RAW=m ··· 232 233 CONFIG_IP6_NF_MATCH_RT=m 233 234 CONFIG_IP6_NF_MATCH_SRH=m 234 235 CONFIG_IP6_NF_TARGET_HL=m 235 - CONFIG_IP6_NF_FILTER=m 236 236 CONFIG_IP6_NF_TARGET_REJECT=m 237 237 CONFIG_IP6_NF_TARGET_SYNPROXY=m 238 - CONFIG_IP6_NF_MANGLE=m 239 238 CONFIG_IP6_NF_RAW=m 240 239 CONFIG_IP6_NF_NAT=m 241 240 CONFIG_IP6_NF_TARGET_MASQUERADE=m ··· 242 245 CONFIG_NFT_BRIDGE_META=m 243 246 CONFIG_NFT_BRIDGE_REJECT=m 244 247 CONFIG_NF_CONNTRACK_BRIDGE=m 248 + CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m 245 249 CONFIG_BRIDGE_NF_EBTABLES=m 246 250 CONFIG_BRIDGE_EBT_BROUTE=m 247 251 CONFIG_BRIDGE_EBT_T_FILTER=m ··· 307 309 CONFIG_BLK_DEV_DRBD=m 308 310 CONFIG_BLK_DEV_NBD=m 309 311 CONFIG_BLK_DEV_RAM=y 310 - CONFIG_CDROM_PKTCDVD=m 311 312 CONFIG_ATA_OVER_ETH=m 312 313 CONFIG_DUMMY_IRQ=m 313 314 CONFIG_RAID_ATTRS=m ··· 600 603 CONFIG_CRYPTO_USER_API_AEAD=m 601 604 # CONFIG_CRYPTO_HW is not set 602 605 CONFIG_PRIME_NUMBERS=m 606 + CONFIG_CRC_BENCHMARK=y 603 607 CONFIG_XZ_DEC_TEST=m 604 608 CONFIG_GLOB_SELFTEST=m 605 609 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 632 634 CONFIG_TEST_FIRMWARE=m 633 635 CONFIG_TEST_SYSCTL=m 634 636 CONFIG_LINEAR_RANGES_TEST=m 635 - CONFIG_CRC_BENCHMARK=y 636 637 CONFIG_TEST_UDELAY=m 637 638 CONFIG_TEST_STATIC_KEYS=m 638 639 CONFIG_TEST_KMOD=m
+3 -6
arch/m68k/configs/apollo_defconfig
··· 121 121 CONFIG_NFT_REJECT_NETDEV=m 122 122 CONFIG_NF_FLOW_TABLE_INET=m 123 123 CONFIG_NF_FLOW_TABLE=m 124 + CONFIG_NETFILTER_XTABLES_LEGACY=y 124 125 CONFIG_NETFILTER_XT_SET=m 125 126 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 126 127 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m ··· 203 202 CONFIG_IP_NF_MATCH_ECN=m 204 203 CONFIG_IP_NF_MATCH_RPFILTER=m 205 204 CONFIG_IP_NF_MATCH_TTL=m 206 - CONFIG_IP_NF_FILTER=m 207 205 CONFIG_IP_NF_TARGET_REJECT=m 208 206 CONFIG_IP_NF_TARGET_SYNPROXY=m 209 207 CONFIG_IP_NF_NAT=m 210 208 CONFIG_IP_NF_TARGET_MASQUERADE=m 211 209 CONFIG_IP_NF_TARGET_NETMAP=m 212 210 CONFIG_IP_NF_TARGET_REDIRECT=m 213 - CONFIG_IP_NF_MANGLE=m 214 211 CONFIG_IP_NF_TARGET_ECN=m 215 212 CONFIG_IP_NF_TARGET_TTL=m 216 213 CONFIG_IP_NF_RAW=m ··· 228 229 CONFIG_IP6_NF_MATCH_RT=m 229 230 CONFIG_IP6_NF_MATCH_SRH=m 230 231 CONFIG_IP6_NF_TARGET_HL=m 231 - CONFIG_IP6_NF_FILTER=m 232 232 CONFIG_IP6_NF_TARGET_REJECT=m 233 233 CONFIG_IP6_NF_TARGET_SYNPROXY=m 234 - CONFIG_IP6_NF_MANGLE=m 235 234 CONFIG_IP6_NF_RAW=m 236 235 CONFIG_IP6_NF_NAT=m 237 236 CONFIG_IP6_NF_TARGET_MASQUERADE=m ··· 238 241 CONFIG_NFT_BRIDGE_META=m 239 242 CONFIG_NFT_BRIDGE_REJECT=m 240 243 CONFIG_NF_CONNTRACK_BRIDGE=m 244 + CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m 241 245 CONFIG_BRIDGE_NF_EBTABLES=m 242 246 CONFIG_BRIDGE_EBT_BROUTE=m 243 247 CONFIG_BRIDGE_EBT_T_FILTER=m ··· 297 299 CONFIG_BLK_DEV_DRBD=m 298 300 CONFIG_BLK_DEV_NBD=m 299 301 CONFIG_BLK_DEV_RAM=y 300 - CONFIG_CDROM_PKTCDVD=m 301 302 CONFIG_ATA_OVER_ETH=m 302 303 CONFIG_DUMMY_IRQ=m 303 304 CONFIG_RAID_ATTRS=m ··· 557 560 CONFIG_CRYPTO_USER_API_AEAD=m 558 561 # CONFIG_CRYPTO_HW is not set 559 562 CONFIG_PRIME_NUMBERS=m 563 + CONFIG_CRC_BENCHMARK=y 560 564 CONFIG_XZ_DEC_TEST=m 561 565 CONFIG_GLOB_SELFTEST=m 562 566 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 589 591 CONFIG_TEST_FIRMWARE=m 590 592 CONFIG_TEST_SYSCTL=m 591 593 CONFIG_LINEAR_RANGES_TEST=m 592 - CONFIG_CRC_BENCHMARK=y 593 594 CONFIG_TEST_UDELAY=m 594 595 CONFIG_TEST_STATIC_KEYS=m 595 596 CONFIG_TEST_KMOD=m
+3 -6
arch/m68k/configs/atari_defconfig
··· 128 128 CONFIG_NFT_REJECT_NETDEV=m 129 129 CONFIG_NF_FLOW_TABLE_INET=m 130 130 CONFIG_NF_FLOW_TABLE=m 131 + CONFIG_NETFILTER_XTABLES_LEGACY=y 131 132 CONFIG_NETFILTER_XT_SET=m 132 133 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 133 134 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m ··· 210 209 CONFIG_IP_NF_MATCH_ECN=m 211 210 CONFIG_IP_NF_MATCH_RPFILTER=m 212 211 CONFIG_IP_NF_MATCH_TTL=m 213 - CONFIG_IP_NF_FILTER=m 214 212 CONFIG_IP_NF_TARGET_REJECT=m 215 213 CONFIG_IP_NF_TARGET_SYNPROXY=m 216 214 CONFIG_IP_NF_NAT=m 217 215 CONFIG_IP_NF_TARGET_MASQUERADE=m 218 216 CONFIG_IP_NF_TARGET_NETMAP=m 219 217 CONFIG_IP_NF_TARGET_REDIRECT=m 220 - CONFIG_IP_NF_MANGLE=m 221 218 CONFIG_IP_NF_TARGET_ECN=m 222 219 CONFIG_IP_NF_TARGET_TTL=m 223 220 CONFIG_IP_NF_RAW=m ··· 235 236 CONFIG_IP6_NF_MATCH_RT=m 236 237 CONFIG_IP6_NF_MATCH_SRH=m 237 238 CONFIG_IP6_NF_TARGET_HL=m 238 - CONFIG_IP6_NF_FILTER=m 239 239 CONFIG_IP6_NF_TARGET_REJECT=m 240 240 CONFIG_IP6_NF_TARGET_SYNPROXY=m 241 - CONFIG_IP6_NF_MANGLE=m 242 241 CONFIG_IP6_NF_RAW=m 243 242 CONFIG_IP6_NF_NAT=m 244 243 CONFIG_IP6_NF_TARGET_MASQUERADE=m ··· 245 248 CONFIG_NFT_BRIDGE_META=m 246 249 CONFIG_NFT_BRIDGE_REJECT=m 247 250 CONFIG_NF_CONNTRACK_BRIDGE=m 251 + CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m 248 252 CONFIG_BRIDGE_NF_EBTABLES=m 249 253 CONFIG_BRIDGE_EBT_BROUTE=m 250 254 CONFIG_BRIDGE_EBT_T_FILTER=m ··· 308 310 CONFIG_BLK_DEV_DRBD=m 309 311 CONFIG_BLK_DEV_NBD=m 310 312 CONFIG_BLK_DEV_RAM=y 311 - CONFIG_CDROM_PKTCDVD=m 312 313 CONFIG_ATA_OVER_ETH=m 313 314 CONFIG_DUMMY_IRQ=m 314 315 CONFIG_RAID_ATTRS=m ··· 577 580 CONFIG_CRYPTO_USER_API_AEAD=m 578 581 # CONFIG_CRYPTO_HW is not set 579 582 CONFIG_PRIME_NUMBERS=m 583 + CONFIG_CRC_BENCHMARK=y 580 584 CONFIG_XZ_DEC_TEST=m 581 585 CONFIG_GLOB_SELFTEST=m 582 586 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 609 611 CONFIG_TEST_FIRMWARE=m 610 612 CONFIG_TEST_SYSCTL=m 611 613 CONFIG_LINEAR_RANGES_TEST=m 612 - CONFIG_CRC_BENCHMARK=y 613 614 CONFIG_TEST_UDELAY=m 614 615 CONFIG_TEST_STATIC_KEYS=m 615 616 CONFIG_TEST_KMOD=m
+3 -6
arch/m68k/configs/bvme6000_defconfig
··· 118 118 CONFIG_NFT_REJECT_NETDEV=m 119 119 CONFIG_NF_FLOW_TABLE_INET=m 120 120 CONFIG_NF_FLOW_TABLE=m 121 + CONFIG_NETFILTER_XTABLES_LEGACY=y 121 122 CONFIG_NETFILTER_XT_SET=m 122 123 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 123 124 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m ··· 200 199 CONFIG_IP_NF_MATCH_ECN=m 201 200 CONFIG_IP_NF_MATCH_RPFILTER=m 202 201 CONFIG_IP_NF_MATCH_TTL=m 203 - CONFIG_IP_NF_FILTER=m 204 202 CONFIG_IP_NF_TARGET_REJECT=m 205 203 CONFIG_IP_NF_TARGET_SYNPROXY=m 206 204 CONFIG_IP_NF_NAT=m 207 205 CONFIG_IP_NF_TARGET_MASQUERADE=m 208 206 CONFIG_IP_NF_TARGET_NETMAP=m 209 207 CONFIG_IP_NF_TARGET_REDIRECT=m 210 - CONFIG_IP_NF_MANGLE=m 211 208 CONFIG_IP_NF_TARGET_ECN=m 212 209 CONFIG_IP_NF_TARGET_TTL=m 213 210 CONFIG_IP_NF_RAW=m ··· 225 226 CONFIG_IP6_NF_MATCH_RT=m 226 227 CONFIG_IP6_NF_MATCH_SRH=m 227 228 CONFIG_IP6_NF_TARGET_HL=m 228 - CONFIG_IP6_NF_FILTER=m 229 229 CONFIG_IP6_NF_TARGET_REJECT=m 230 230 CONFIG_IP6_NF_TARGET_SYNPROXY=m 231 - CONFIG_IP6_NF_MANGLE=m 232 231 CONFIG_IP6_NF_RAW=m 233 232 CONFIG_IP6_NF_NAT=m 234 233 CONFIG_IP6_NF_TARGET_MASQUERADE=m ··· 235 238 CONFIG_NFT_BRIDGE_META=m 236 239 CONFIG_NFT_BRIDGE_REJECT=m 237 240 CONFIG_NF_CONNTRACK_BRIDGE=m 241 + CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m 238 242 CONFIG_BRIDGE_NF_EBTABLES=m 239 243 CONFIG_BRIDGE_EBT_BROUTE=m 240 244 CONFIG_BRIDGE_EBT_T_FILTER=m ··· 294 296 CONFIG_BLK_DEV_DRBD=m 295 297 CONFIG_BLK_DEV_NBD=m 296 298 CONFIG_BLK_DEV_RAM=y 297 - CONFIG_CDROM_PKTCDVD=m 298 299 CONFIG_ATA_OVER_ETH=m 299 300 CONFIG_DUMMY_IRQ=m 300 301 CONFIG_RAID_ATTRS=m ··· 549 552 CONFIG_CRYPTO_USER_API_AEAD=m 550 553 # CONFIG_CRYPTO_HW is not set 551 554 CONFIG_PRIME_NUMBERS=m 555 + CONFIG_CRC_BENCHMARK=y 552 556 CONFIG_XZ_DEC_TEST=m 553 557 CONFIG_GLOB_SELFTEST=m 554 558 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 581 583 CONFIG_TEST_FIRMWARE=m 582 584 CONFIG_TEST_SYSCTL=m 583 585 CONFIG_LINEAR_RANGES_TEST=m 584 - CONFIG_CRC_BENCHMARK=y 585 586 CONFIG_TEST_UDELAY=m 586 587 CONFIG_TEST_STATIC_KEYS=m 587 588 CONFIG_TEST_KMOD=m
+3 -6
arch/m68k/configs/hp300_defconfig
··· 120 120 CONFIG_NFT_REJECT_NETDEV=m 121 121 CONFIG_NF_FLOW_TABLE_INET=m 122 122 CONFIG_NF_FLOW_TABLE=m 123 + CONFIG_NETFILTER_XTABLES_LEGACY=y 123 124 CONFIG_NETFILTER_XT_SET=m 124 125 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 125 126 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m ··· 202 201 CONFIG_IP_NF_MATCH_ECN=m 203 202 CONFIG_IP_NF_MATCH_RPFILTER=m 204 203 CONFIG_IP_NF_MATCH_TTL=m 205 - CONFIG_IP_NF_FILTER=m 206 204 CONFIG_IP_NF_TARGET_REJECT=m 207 205 CONFIG_IP_NF_TARGET_SYNPROXY=m 208 206 CONFIG_IP_NF_NAT=m 209 207 CONFIG_IP_NF_TARGET_MASQUERADE=m 210 208 CONFIG_IP_NF_TARGET_NETMAP=m 211 209 CONFIG_IP_NF_TARGET_REDIRECT=m 212 - CONFIG_IP_NF_MANGLE=m 213 210 CONFIG_IP_NF_TARGET_ECN=m 214 211 CONFIG_IP_NF_TARGET_TTL=m 215 212 CONFIG_IP_NF_RAW=m ··· 227 228 CONFIG_IP6_NF_MATCH_RT=m 228 229 CONFIG_IP6_NF_MATCH_SRH=m 229 230 CONFIG_IP6_NF_TARGET_HL=m 230 - CONFIG_IP6_NF_FILTER=m 231 231 CONFIG_IP6_NF_TARGET_REJECT=m 232 232 CONFIG_IP6_NF_TARGET_SYNPROXY=m 233 - CONFIG_IP6_NF_MANGLE=m 234 233 CONFIG_IP6_NF_RAW=m 235 234 CONFIG_IP6_NF_NAT=m 236 235 CONFIG_IP6_NF_TARGET_MASQUERADE=m ··· 237 240 CONFIG_NFT_BRIDGE_META=m 238 241 CONFIG_NFT_BRIDGE_REJECT=m 239 242 CONFIG_NF_CONNTRACK_BRIDGE=m 243 + CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m 240 244 CONFIG_BRIDGE_NF_EBTABLES=m 241 245 CONFIG_BRIDGE_EBT_BROUTE=m 242 246 CONFIG_BRIDGE_EBT_T_FILTER=m ··· 296 298 CONFIG_BLK_DEV_DRBD=m 297 299 CONFIG_BLK_DEV_NBD=m 298 300 CONFIG_BLK_DEV_RAM=y 299 - CONFIG_CDROM_PKTCDVD=m 300 301 CONFIG_ATA_OVER_ETH=m 301 302 CONFIG_DUMMY_IRQ=m 302 303 CONFIG_RAID_ATTRS=m ··· 559 562 CONFIG_CRYPTO_USER_API_AEAD=m 560 563 # CONFIG_CRYPTO_HW is not set 561 564 CONFIG_PRIME_NUMBERS=m 565 + CONFIG_CRC_BENCHMARK=y 562 566 CONFIG_XZ_DEC_TEST=m 563 567 CONFIG_GLOB_SELFTEST=m 564 568 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 591 593 CONFIG_TEST_FIRMWARE=m 592 594 CONFIG_TEST_SYSCTL=m 593 595 CONFIG_LINEAR_RANGES_TEST=m 594 - CONFIG_CRC_BENCHMARK=y 595 596 CONFIG_TEST_UDELAY=m 596 597 CONFIG_TEST_STATIC_KEYS=m 597 598 CONFIG_TEST_KMOD=m
+3 -6
arch/m68k/configs/mac_defconfig
··· 119 119 CONFIG_NFT_REJECT_NETDEV=m 120 120 CONFIG_NF_FLOW_TABLE_INET=m 121 121 CONFIG_NF_FLOW_TABLE=m 122 + CONFIG_NETFILTER_XTABLES_LEGACY=y 122 123 CONFIG_NETFILTER_XT_SET=m 123 124 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 124 125 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m ··· 201 200 CONFIG_IP_NF_MATCH_ECN=m 202 201 CONFIG_IP_NF_MATCH_RPFILTER=m 203 202 CONFIG_IP_NF_MATCH_TTL=m 204 - CONFIG_IP_NF_FILTER=m 205 203 CONFIG_IP_NF_TARGET_REJECT=m 206 204 CONFIG_IP_NF_TARGET_SYNPROXY=m 207 205 CONFIG_IP_NF_NAT=m 208 206 CONFIG_IP_NF_TARGET_MASQUERADE=m 209 207 CONFIG_IP_NF_TARGET_NETMAP=m 210 208 CONFIG_IP_NF_TARGET_REDIRECT=m 211 - CONFIG_IP_NF_MANGLE=m 212 209 CONFIG_IP_NF_TARGET_ECN=m 213 210 CONFIG_IP_NF_TARGET_TTL=m 214 211 CONFIG_IP_NF_RAW=m ··· 226 227 CONFIG_IP6_NF_MATCH_RT=m 227 228 CONFIG_IP6_NF_MATCH_SRH=m 228 229 CONFIG_IP6_NF_TARGET_HL=m 229 - CONFIG_IP6_NF_FILTER=m 230 230 CONFIG_IP6_NF_TARGET_REJECT=m 231 231 CONFIG_IP6_NF_TARGET_SYNPROXY=m 232 - CONFIG_IP6_NF_MANGLE=m 233 232 CONFIG_IP6_NF_RAW=m 234 233 CONFIG_IP6_NF_NAT=m 235 234 CONFIG_IP6_NF_TARGET_MASQUERADE=m ··· 236 239 CONFIG_NFT_BRIDGE_META=m 237 240 CONFIG_NFT_BRIDGE_REJECT=m 238 241 CONFIG_NF_CONNTRACK_BRIDGE=m 242 + CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m 239 243 CONFIG_BRIDGE_NF_EBTABLES=m 240 244 CONFIG_BRIDGE_EBT_BROUTE=m 241 245 CONFIG_BRIDGE_EBT_T_FILTER=m ··· 296 298 CONFIG_BLK_DEV_DRBD=m 297 299 CONFIG_BLK_DEV_NBD=m 298 300 CONFIG_BLK_DEV_RAM=y 299 - CONFIG_CDROM_PKTCDVD=m 300 301 CONFIG_ATA_OVER_ETH=m 301 302 CONFIG_DUMMY_IRQ=m 302 303 CONFIG_RAID_ATTRS=m ··· 576 579 CONFIG_CRYPTO_USER_API_AEAD=m 577 580 # CONFIG_CRYPTO_HW is not set 578 581 CONFIG_PRIME_NUMBERS=m 582 + CONFIG_CRC_BENCHMARK=y 579 583 CONFIG_XZ_DEC_TEST=m 580 584 CONFIG_GLOB_SELFTEST=m 581 585 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 608 610 CONFIG_TEST_FIRMWARE=m 609 611 CONFIG_TEST_SYSCTL=m 610 612 CONFIG_LINEAR_RANGES_TEST=m 611 - CONFIG_CRC_BENCHMARK=y 612 613 CONFIG_TEST_UDELAY=m 613 614 CONFIG_TEST_STATIC_KEYS=m 614 615 CONFIG_TEST_KMOD=m
+3 -6
arch/m68k/configs/multi_defconfig
··· 139 139 CONFIG_NFT_REJECT_NETDEV=m 140 140 CONFIG_NF_FLOW_TABLE_INET=m 141 141 CONFIG_NF_FLOW_TABLE=m 142 + CONFIG_NETFILTER_XTABLES_LEGACY=y 142 143 CONFIG_NETFILTER_XT_SET=m 143 144 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 144 145 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m ··· 221 220 CONFIG_IP_NF_MATCH_ECN=m 222 221 CONFIG_IP_NF_MATCH_RPFILTER=m 223 222 CONFIG_IP_NF_MATCH_TTL=m 224 - CONFIG_IP_NF_FILTER=m 225 223 CONFIG_IP_NF_TARGET_REJECT=m 226 224 CONFIG_IP_NF_TARGET_SYNPROXY=m 227 225 CONFIG_IP_NF_NAT=m 228 226 CONFIG_IP_NF_TARGET_MASQUERADE=m 229 227 CONFIG_IP_NF_TARGET_NETMAP=m 230 228 CONFIG_IP_NF_TARGET_REDIRECT=m 231 - CONFIG_IP_NF_MANGLE=m 232 229 CONFIG_IP_NF_TARGET_ECN=m 233 230 CONFIG_IP_NF_TARGET_TTL=m 234 231 CONFIG_IP_NF_RAW=m ··· 246 247 CONFIG_IP6_NF_MATCH_RT=m 247 248 CONFIG_IP6_NF_MATCH_SRH=m 248 249 CONFIG_IP6_NF_TARGET_HL=m 249 - CONFIG_IP6_NF_FILTER=m 250 250 CONFIG_IP6_NF_TARGET_REJECT=m 251 251 CONFIG_IP6_NF_TARGET_SYNPROXY=m 252 - CONFIG_IP6_NF_MANGLE=m 253 252 CONFIG_IP6_NF_RAW=m 254 253 CONFIG_IP6_NF_NAT=m 255 254 CONFIG_IP6_NF_TARGET_MASQUERADE=m ··· 256 259 CONFIG_NFT_BRIDGE_META=m 257 260 CONFIG_NFT_BRIDGE_REJECT=m 258 261 CONFIG_NF_CONNTRACK_BRIDGE=m 262 + CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m 259 263 CONFIG_BRIDGE_NF_EBTABLES=m 260 264 CONFIG_BRIDGE_EBT_BROUTE=m 261 265 CONFIG_BRIDGE_EBT_T_FILTER=m ··· 325 327 CONFIG_BLK_DEV_DRBD=m 326 328 CONFIG_BLK_DEV_NBD=m 327 329 CONFIG_BLK_DEV_RAM=y 328 - CONFIG_CDROM_PKTCDVD=m 329 330 CONFIG_ATA_OVER_ETH=m 330 331 CONFIG_DUMMY_IRQ=m 331 332 CONFIG_RAID_ATTRS=m ··· 663 666 CONFIG_CRYPTO_USER_API_AEAD=m 664 667 # CONFIG_CRYPTO_HW is not set 665 668 CONFIG_PRIME_NUMBERS=m 669 + CONFIG_CRC_BENCHMARK=y 666 670 CONFIG_XZ_DEC_TEST=m 667 671 CONFIG_GLOB_SELFTEST=m 668 672 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 695 697 CONFIG_TEST_FIRMWARE=m 696 698 CONFIG_TEST_SYSCTL=m 697 699 CONFIG_LINEAR_RANGES_TEST=m 698 - CONFIG_CRC_BENCHMARK=y 699 700 CONFIG_TEST_UDELAY=m 700 701 CONFIG_TEST_STATIC_KEYS=m 701 702 CONFIG_TEST_KMOD=m
+3 -6
arch/m68k/configs/mvme147_defconfig
··· 117 117 CONFIG_NFT_REJECT_NETDEV=m 118 118 CONFIG_NF_FLOW_TABLE_INET=m 119 119 CONFIG_NF_FLOW_TABLE=m 120 + CONFIG_NETFILTER_XTABLES_LEGACY=y 120 121 CONFIG_NETFILTER_XT_SET=m 121 122 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 122 123 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m ··· 199 198 CONFIG_IP_NF_MATCH_ECN=m 200 199 CONFIG_IP_NF_MATCH_RPFILTER=m 201 200 CONFIG_IP_NF_MATCH_TTL=m 202 - CONFIG_IP_NF_FILTER=m 203 201 CONFIG_IP_NF_TARGET_REJECT=m 204 202 CONFIG_IP_NF_TARGET_SYNPROXY=m 205 203 CONFIG_IP_NF_NAT=m 206 204 CONFIG_IP_NF_TARGET_MASQUERADE=m 207 205 CONFIG_IP_NF_TARGET_NETMAP=m 208 206 CONFIG_IP_NF_TARGET_REDIRECT=m 209 - CONFIG_IP_NF_MANGLE=m 210 207 CONFIG_IP_NF_TARGET_ECN=m 211 208 CONFIG_IP_NF_TARGET_TTL=m 212 209 CONFIG_IP_NF_RAW=m ··· 224 225 CONFIG_IP6_NF_MATCH_RT=m 225 226 CONFIG_IP6_NF_MATCH_SRH=m 226 227 CONFIG_IP6_NF_TARGET_HL=m 227 - CONFIG_IP6_NF_FILTER=m 228 228 CONFIG_IP6_NF_TARGET_REJECT=m 229 229 CONFIG_IP6_NF_TARGET_SYNPROXY=m 230 - CONFIG_IP6_NF_MANGLE=m 231 230 CONFIG_IP6_NF_RAW=m 232 231 CONFIG_IP6_NF_NAT=m 233 232 CONFIG_IP6_NF_TARGET_MASQUERADE=m ··· 234 237 CONFIG_NFT_BRIDGE_META=m 235 238 CONFIG_NFT_BRIDGE_REJECT=m 236 239 CONFIG_NF_CONNTRACK_BRIDGE=m 240 + CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m 237 241 CONFIG_BRIDGE_NF_EBTABLES=m 238 242 CONFIG_BRIDGE_EBT_BROUTE=m 239 243 CONFIG_BRIDGE_EBT_T_FILTER=m ··· 293 295 CONFIG_BLK_DEV_DRBD=m 294 296 CONFIG_BLK_DEV_NBD=m 295 297 CONFIG_BLK_DEV_RAM=y 296 - CONFIG_CDROM_PKTCDVD=m 297 298 CONFIG_ATA_OVER_ETH=m 298 299 CONFIG_DUMMY_IRQ=m 299 300 CONFIG_RAID_ATTRS=m ··· 549 552 CONFIG_CRYPTO_USER_API_AEAD=m 550 553 # CONFIG_CRYPTO_HW is not set 551 554 CONFIG_PRIME_NUMBERS=m 555 + CONFIG_CRC_BENCHMARK=y 552 556 CONFIG_XZ_DEC_TEST=m 553 557 CONFIG_GLOB_SELFTEST=m 554 558 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 581 583 CONFIG_TEST_FIRMWARE=m 582 584 CONFIG_TEST_SYSCTL=m 583 585 CONFIG_LINEAR_RANGES_TEST=m 584 - CONFIG_CRC_BENCHMARK=y 585 586 CONFIG_TEST_UDELAY=m 586 587 CONFIG_TEST_STATIC_KEYS=m 587 588 CONFIG_TEST_KMOD=m
+3 -6
arch/m68k/configs/mvme16x_defconfig
··· 118 118 CONFIG_NFT_REJECT_NETDEV=m 119 119 CONFIG_NF_FLOW_TABLE_INET=m 120 120 CONFIG_NF_FLOW_TABLE=m 121 + CONFIG_NETFILTER_XTABLES_LEGACY=y 121 122 CONFIG_NETFILTER_XT_SET=m 122 123 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 123 124 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m ··· 200 199 CONFIG_IP_NF_MATCH_ECN=m 201 200 CONFIG_IP_NF_MATCH_RPFILTER=m 202 201 CONFIG_IP_NF_MATCH_TTL=m 203 - CONFIG_IP_NF_FILTER=m 204 202 CONFIG_IP_NF_TARGET_REJECT=m 205 203 CONFIG_IP_NF_TARGET_SYNPROXY=m 206 204 CONFIG_IP_NF_NAT=m 207 205 CONFIG_IP_NF_TARGET_MASQUERADE=m 208 206 CONFIG_IP_NF_TARGET_NETMAP=m 209 207 CONFIG_IP_NF_TARGET_REDIRECT=m 210 - CONFIG_IP_NF_MANGLE=m 211 208 CONFIG_IP_NF_TARGET_ECN=m 212 209 CONFIG_IP_NF_TARGET_TTL=m 213 210 CONFIG_IP_NF_RAW=m ··· 225 226 CONFIG_IP6_NF_MATCH_RT=m 226 227 CONFIG_IP6_NF_MATCH_SRH=m 227 228 CONFIG_IP6_NF_TARGET_HL=m 228 - CONFIG_IP6_NF_FILTER=m 229 229 CONFIG_IP6_NF_TARGET_REJECT=m 230 230 CONFIG_IP6_NF_TARGET_SYNPROXY=m 231 - CONFIG_IP6_NF_MANGLE=m 232 231 CONFIG_IP6_NF_RAW=m 233 232 CONFIG_IP6_NF_NAT=m 234 233 CONFIG_IP6_NF_TARGET_MASQUERADE=m ··· 235 238 CONFIG_NFT_BRIDGE_META=m 236 239 CONFIG_NFT_BRIDGE_REJECT=m 237 240 CONFIG_NF_CONNTRACK_BRIDGE=m 241 + CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m 238 242 CONFIG_BRIDGE_NF_EBTABLES=m 239 243 CONFIG_BRIDGE_EBT_BROUTE=m 240 244 CONFIG_BRIDGE_EBT_T_FILTER=m ··· 294 296 CONFIG_BLK_DEV_DRBD=m 295 297 CONFIG_BLK_DEV_NBD=m 296 298 CONFIG_BLK_DEV_RAM=y 297 - CONFIG_CDROM_PKTCDVD=m 298 299 CONFIG_ATA_OVER_ETH=m 299 300 CONFIG_DUMMY_IRQ=m 300 301 CONFIG_RAID_ATTRS=m ··· 550 553 CONFIG_CRYPTO_USER_API_AEAD=m 551 554 # CONFIG_CRYPTO_HW is not set 552 555 CONFIG_PRIME_NUMBERS=m 556 + CONFIG_CRC_BENCHMARK=y 553 557 CONFIG_XZ_DEC_TEST=m 554 558 CONFIG_GLOB_SELFTEST=m 555 559 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 582 584 CONFIG_TEST_FIRMWARE=m 583 585 CONFIG_TEST_SYSCTL=m 584 586 CONFIG_LINEAR_RANGES_TEST=m 585 - CONFIG_CRC_BENCHMARK=y 586 587 CONFIG_TEST_UDELAY=m 587 588 CONFIG_TEST_STATIC_KEYS=m 588 589 CONFIG_TEST_KMOD=m
+3 -6
arch/m68k/configs/q40_defconfig
··· 119 119 CONFIG_NFT_REJECT_NETDEV=m 120 120 CONFIG_NF_FLOW_TABLE_INET=m 121 121 CONFIG_NF_FLOW_TABLE=m 122 + CONFIG_NETFILTER_XTABLES_LEGACY=y 122 123 CONFIG_NETFILTER_XT_SET=m 123 124 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 124 125 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m ··· 201 200 CONFIG_IP_NF_MATCH_ECN=m 202 201 CONFIG_IP_NF_MATCH_RPFILTER=m 203 202 CONFIG_IP_NF_MATCH_TTL=m 204 - CONFIG_IP_NF_FILTER=m 205 203 CONFIG_IP_NF_TARGET_REJECT=m 206 204 CONFIG_IP_NF_TARGET_SYNPROXY=m 207 205 CONFIG_IP_NF_NAT=m 208 206 CONFIG_IP_NF_TARGET_MASQUERADE=m 209 207 CONFIG_IP_NF_TARGET_NETMAP=m 210 208 CONFIG_IP_NF_TARGET_REDIRECT=m 211 - CONFIG_IP_NF_MANGLE=m 212 209 CONFIG_IP_NF_TARGET_ECN=m 213 210 CONFIG_IP_NF_TARGET_TTL=m 214 211 CONFIG_IP_NF_RAW=m ··· 226 227 CONFIG_IP6_NF_MATCH_RT=m 227 228 CONFIG_IP6_NF_MATCH_SRH=m 228 229 CONFIG_IP6_NF_TARGET_HL=m 229 - CONFIG_IP6_NF_FILTER=m 230 230 CONFIG_IP6_NF_TARGET_REJECT=m 231 231 CONFIG_IP6_NF_TARGET_SYNPROXY=m 232 - CONFIG_IP6_NF_MANGLE=m 233 232 CONFIG_IP6_NF_RAW=m 234 233 CONFIG_IP6_NF_NAT=m 235 234 CONFIG_IP6_NF_TARGET_MASQUERADE=m ··· 236 239 CONFIG_NFT_BRIDGE_META=m 237 240 CONFIG_NFT_BRIDGE_REJECT=m 238 241 CONFIG_NF_CONNTRACK_BRIDGE=m 242 + CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m 239 243 CONFIG_BRIDGE_NF_EBTABLES=m 240 244 CONFIG_BRIDGE_EBT_BROUTE=m 241 245 CONFIG_BRIDGE_EBT_T_FILTER=m ··· 298 300 CONFIG_BLK_DEV_DRBD=m 299 301 CONFIG_BLK_DEV_NBD=m 300 302 CONFIG_BLK_DEV_RAM=y 301 - CONFIG_CDROM_PKTCDVD=m 302 303 CONFIG_ATA_OVER_ETH=m 303 304 CONFIG_DUMMY_IRQ=m 304 305 CONFIG_RAID_ATTRS=m ··· 566 569 CONFIG_CRYPTO_USER_API_AEAD=m 567 570 # CONFIG_CRYPTO_HW is not set 568 571 CONFIG_PRIME_NUMBERS=m 572 + CONFIG_CRC_BENCHMARK=y 569 573 CONFIG_XZ_DEC_TEST=m 570 574 CONFIG_GLOB_SELFTEST=m 571 575 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 598 600 CONFIG_TEST_FIRMWARE=m 599 601 CONFIG_TEST_SYSCTL=m 600 602 CONFIG_LINEAR_RANGES_TEST=m 601 - CONFIG_CRC_BENCHMARK=y 602 603 CONFIG_TEST_UDELAY=m 603 604 CONFIG_TEST_STATIC_KEYS=m 604 605 CONFIG_TEST_KMOD=m
+3 -6
arch/m68k/configs/sun3_defconfig
··· 114 114 CONFIG_NFT_REJECT_NETDEV=m 115 115 CONFIG_NF_FLOW_TABLE_INET=m 116 116 CONFIG_NF_FLOW_TABLE=m 117 + CONFIG_NETFILTER_XTABLES_LEGACY=y 117 118 CONFIG_NETFILTER_XT_SET=m 118 119 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 119 120 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m ··· 196 195 CONFIG_IP_NF_MATCH_ECN=m 197 196 CONFIG_IP_NF_MATCH_RPFILTER=m 198 197 CONFIG_IP_NF_MATCH_TTL=m 199 - CONFIG_IP_NF_FILTER=m 200 198 CONFIG_IP_NF_TARGET_REJECT=m 201 199 CONFIG_IP_NF_TARGET_SYNPROXY=m 202 200 CONFIG_IP_NF_NAT=m 203 201 CONFIG_IP_NF_TARGET_MASQUERADE=m 204 202 CONFIG_IP_NF_TARGET_NETMAP=m 205 203 CONFIG_IP_NF_TARGET_REDIRECT=m 206 - CONFIG_IP_NF_MANGLE=m 207 204 CONFIG_IP_NF_TARGET_ECN=m 208 205 CONFIG_IP_NF_TARGET_TTL=m 209 206 CONFIG_IP_NF_RAW=m ··· 221 222 CONFIG_IP6_NF_MATCH_RT=m 222 223 CONFIG_IP6_NF_MATCH_SRH=m 223 224 CONFIG_IP6_NF_TARGET_HL=m 224 - CONFIG_IP6_NF_FILTER=m 225 225 CONFIG_IP6_NF_TARGET_REJECT=m 226 226 CONFIG_IP6_NF_TARGET_SYNPROXY=m 227 - CONFIG_IP6_NF_MANGLE=m 228 227 CONFIG_IP6_NF_RAW=m 229 228 CONFIG_IP6_NF_NAT=m 230 229 CONFIG_IP6_NF_TARGET_MASQUERADE=m ··· 231 234 CONFIG_NFT_BRIDGE_META=m 232 235 CONFIG_NFT_BRIDGE_REJECT=m 233 236 CONFIG_NF_CONNTRACK_BRIDGE=m 237 + CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m 234 238 CONFIG_BRIDGE_NF_EBTABLES=m 235 239 CONFIG_BRIDGE_EBT_BROUTE=m 236 240 CONFIG_BRIDGE_EBT_T_FILTER=m ··· 290 292 CONFIG_BLK_DEV_DRBD=m 291 293 CONFIG_BLK_DEV_NBD=m 292 294 CONFIG_BLK_DEV_RAM=y 293 - CONFIG_CDROM_PKTCDVD=m 294 295 CONFIG_ATA_OVER_ETH=m 295 296 CONFIG_DUMMY_IRQ=m 296 297 CONFIG_RAID_ATTRS=m ··· 547 550 CONFIG_CRYPTO_USER_API_AEAD=m 548 551 # CONFIG_CRYPTO_HW is not set 549 552 CONFIG_PRIME_NUMBERS=m 553 + CONFIG_CRC_BENCHMARK=y 550 554 CONFIG_XZ_DEC_TEST=m 551 555 CONFIG_GLOB_SELFTEST=m 552 556 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 578 580 CONFIG_TEST_FIRMWARE=m 579 581 CONFIG_TEST_SYSCTL=m 580 582 CONFIG_LINEAR_RANGES_TEST=m 581 - CONFIG_CRC_BENCHMARK=y 582 583 CONFIG_TEST_UDELAY=m 583 584 CONFIG_TEST_STATIC_KEYS=m 584 585 CONFIG_TEST_KMOD=m
+3 -6
arch/m68k/configs/sun3x_defconfig
··· 115 115 CONFIG_NFT_REJECT_NETDEV=m 116 116 CONFIG_NF_FLOW_TABLE_INET=m 117 117 CONFIG_NF_FLOW_TABLE=m 118 + CONFIG_NETFILTER_XTABLES_LEGACY=y 118 119 CONFIG_NETFILTER_XT_SET=m 119 120 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 120 121 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m ··· 197 196 CONFIG_IP_NF_MATCH_ECN=m 198 197 CONFIG_IP_NF_MATCH_RPFILTER=m 199 198 CONFIG_IP_NF_MATCH_TTL=m 200 - CONFIG_IP_NF_FILTER=m 201 199 CONFIG_IP_NF_TARGET_REJECT=m 202 200 CONFIG_IP_NF_TARGET_SYNPROXY=m 203 201 CONFIG_IP_NF_NAT=m 204 202 CONFIG_IP_NF_TARGET_MASQUERADE=m 205 203 CONFIG_IP_NF_TARGET_NETMAP=m 206 204 CONFIG_IP_NF_TARGET_REDIRECT=m 207 - CONFIG_IP_NF_MANGLE=m 208 205 CONFIG_IP_NF_TARGET_ECN=m 209 206 CONFIG_IP_NF_TARGET_TTL=m 210 207 CONFIG_IP_NF_RAW=m ··· 222 223 CONFIG_IP6_NF_MATCH_RT=m 223 224 CONFIG_IP6_NF_MATCH_SRH=m 224 225 CONFIG_IP6_NF_TARGET_HL=m 225 - CONFIG_IP6_NF_FILTER=m 226 226 CONFIG_IP6_NF_TARGET_REJECT=m 227 227 CONFIG_IP6_NF_TARGET_SYNPROXY=m 228 - CONFIG_IP6_NF_MANGLE=m 229 228 CONFIG_IP6_NF_RAW=m 230 229 CONFIG_IP6_NF_NAT=m 231 230 CONFIG_IP6_NF_TARGET_MASQUERADE=m ··· 232 235 CONFIG_NFT_BRIDGE_META=m 233 236 CONFIG_NFT_BRIDGE_REJECT=m 234 237 CONFIG_NF_CONNTRACK_BRIDGE=m 238 + CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m 235 239 CONFIG_BRIDGE_NF_EBTABLES=m 236 240 CONFIG_BRIDGE_EBT_BROUTE=m 237 241 CONFIG_BRIDGE_EBT_T_FILTER=m ··· 291 293 CONFIG_BLK_DEV_DRBD=m 292 294 CONFIG_BLK_DEV_NBD=m 293 295 CONFIG_BLK_DEV_RAM=y 294 - CONFIG_CDROM_PKTCDVD=m 295 296 CONFIG_ATA_OVER_ETH=m 296 297 CONFIG_DUMMY_IRQ=m 297 298 CONFIG_RAID_ATTRS=m ··· 547 550 CONFIG_CRYPTO_USER_API_AEAD=m 548 551 # CONFIG_CRYPTO_HW is not set 549 552 CONFIG_PRIME_NUMBERS=m 553 + CONFIG_CRC_BENCHMARK=y 550 554 CONFIG_XZ_DEC_TEST=m 551 555 CONFIG_GLOB_SELFTEST=m 552 556 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 579 581 CONFIG_TEST_FIRMWARE=m 580 582 CONFIG_TEST_SYSCTL=m 581 583 CONFIG_LINEAR_RANGES_TEST=m 582 - CONFIG_CRC_BENCHMARK=y 583 584 CONFIG_TEST_UDELAY=m 584 585 CONFIG_TEST_STATIC_KEYS=m 585 586 CONFIG_TEST_KMOD=m
+14 -11
arch/m68k/include/asm/bitops.h
··· 350 350 #include <asm-generic/bitops/ffz.h> 351 351 #else 352 352 353 - static inline int find_first_zero_bit(const unsigned long *vaddr, 354 - unsigned size) 353 + static inline unsigned long find_first_zero_bit(const unsigned long *vaddr, 354 + unsigned long size) 355 355 { 356 356 const unsigned long *p = vaddr; 357 - int res = 32; 358 - unsigned int words; 357 + unsigned long res = 32; 358 + unsigned long words; 359 359 unsigned long num; 360 360 361 361 if (!size) ··· 376 376 } 377 377 #define find_first_zero_bit find_first_zero_bit 378 378 379 - static inline int find_next_zero_bit(const unsigned long *vaddr, int size, 380 - int offset) 379 + static inline unsigned long find_next_zero_bit(const unsigned long *vaddr, 380 + unsigned long size, 381 + unsigned long offset) 381 382 { 382 383 const unsigned long *p = vaddr + (offset >> 5); 383 384 int bit = offset & 31UL, res; ··· 407 406 } 408 407 #define find_next_zero_bit find_next_zero_bit 409 408 410 - static inline int find_first_bit(const unsigned long *vaddr, unsigned size) 409 + static inline unsigned long find_first_bit(const unsigned long *vaddr, 410 + unsigned long size) 411 411 { 412 412 const unsigned long *p = vaddr; 413 - int res = 32; 414 - unsigned int words; 413 + unsigned long res = 32; 414 + unsigned long words; 415 415 unsigned long num; 416 416 417 417 if (!size) ··· 433 431 } 434 432 #define find_first_bit find_first_bit 435 433 436 - static inline int find_next_bit(const unsigned long *vaddr, int size, 437 - int offset) 434 + static inline unsigned long find_next_bit(const unsigned long *vaddr, 435 + unsigned long size, 436 + unsigned long offset) 438 437 { 439 438 const unsigned long *p = vaddr + (offset >> 5); 440 439 int bit = offset & 31UL, res;
+6 -6
drivers/zorro/names.c
··· 36 36 * real memory.. Parse the same file multiple times 37 37 * to get all the info. 38 38 */ 39 - #define MANUF( manuf, name ) static char __manufstr_##manuf[] __initdata = name; 39 + #define MANUF(manuf, name) static char __manufstr_##manuf[] __initdata = name; 40 40 #define ENDMANUF() 41 - #define PRODUCT( manuf, prod, name ) static char __prodstr_##manuf##prod[] __initdata = name; 41 + #define PRODUCT(manuf, prod, name) static char __prodstr_##manuf##prod[] __initdata = name; 42 42 #include "devlist.h" 43 43 44 44 45 - #define MANUF( manuf, name ) static struct zorro_prod_info __prods_##manuf[] __initdata = { 45 + #define MANUF(manuf, name) static struct zorro_prod_info __prods_##manuf[] __initdata = { 46 46 #define ENDMANUF() }; 47 - #define PRODUCT( manuf, prod, name ) { 0x##prod, 0, __prodstr_##manuf##prod }, 47 + #define PRODUCT(manuf, prod, name) { 0x##prod, 0, __prodstr_##manuf##prod }, 48 48 #include "devlist.h" 49 49 50 50 static struct zorro_manuf_info __initdata zorro_manuf_list[] = { 51 - #define MANUF( manuf, name ) { 0x##manuf, ARRAY_SIZE(__prods_##manuf), __manufstr_##manuf, __prods_##manuf }, 51 + #define MANUF(manuf, name) { 0x##manuf, ARRAY_SIZE(__prods_##manuf), __manufstr_##manuf, __prods_##manuf }, 52 52 #define ENDMANUF() 53 - #define PRODUCT( manuf, prod, name ) 53 + #define PRODUCT(manuf, prod, name) 54 54 #include "devlist.h" 55 55 }; 56 56