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

+1

arch/m68k/Kconfig

··· 32 32 select HAVE_ASM_MODVERSIONS 33 33 select HAVE_DEBUG_BUGVERBOSE 34 34 select HAVE_EFFICIENT_UNALIGNED_ACCESS if !CPU_HAS_NO_UNALIGNED 35 + select HAVE_LD_DEAD_CODE_DATA_ELIMINATION 35 36 select HAVE_MOD_ARCH_SPECIFIC 36 37 select HAVE_UID16 37 38 select MMU_GATHER_NO_RANGE if MMU

+1 -1

arch/m68k/Kconfig.debug

··· 10 10 11 11 config EARLY_PRINTK 12 12 bool "Early printk" 13 - depends on !(SUN3 || M68000 || COLDFIRE) 13 + depends on MMU_MOTOROLA 14 14 help 15 15 Write kernel log output directly to a serial port. 16 16 Where implemented, output goes to the framebuffer as well.

+8 -1

arch/m68k/configs/amiga_defconfig

··· 267 267 CONFIG_BRIDGE_EBT_SNAT=m 268 268 CONFIG_BRIDGE_EBT_LOG=m 269 269 CONFIG_BRIDGE_EBT_NFLOG=m 270 + CONFIG_IP_SCTP=m 270 271 CONFIG_SCTP_COOKIE_HMAC_SHA1=y 271 272 CONFIG_RDS=m 272 273 CONFIG_RDS_TCP=m ··· 357 356 CONFIG_NETDEVICES=y 358 357 CONFIG_DUMMY=m 359 358 CONFIG_WIREGUARD=m 359 + CONFIG_OVPN=m 360 360 CONFIG_EQUALIZER=m 361 361 CONFIG_NET_TEAM=m 362 362 CONFIG_NET_TEAM_MODE_BROADCAST=m ··· 377 375 CONFIG_MACSEC=m 378 376 CONFIG_NETCONSOLE=m 379 377 CONFIG_NETCONSOLE_DYNAMIC=y 378 + CONFIG_TUN=m 380 379 CONFIG_VETH=m 381 380 CONFIG_A2065=y 382 381 CONFIG_ARIADNE=y ··· 451 448 CONFIG_DAX=m 452 449 CONFIG_EXT4_FS=y 453 450 CONFIG_JFS_FS=m 451 + CONFIG_XFS_FS=m 454 452 CONFIG_OCFS2_FS=m 455 453 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 454 + CONFIG_BTRFS_FS=m 456 455 CONFIG_BCACHEFS_FS=m 457 456 CONFIG_FANOTIFY=y 458 457 CONFIG_QUOTA_NETLINK_INTERFACE=y ··· 553 548 CONFIG_ENCRYPTED_KEYS=m 554 549 CONFIG_HARDENED_USERCOPY=y 555 550 CONFIG_CRYPTO_USER=m 551 + CONFIG_CRYPTO_NULL=m 556 552 CONFIG_CRYPTO_CRYPTD=m 557 553 CONFIG_CRYPTO_BENCHMARK=m 558 554 CONFIG_CRYPTO_RSA=m ··· 586 580 CONFIG_CRYPTO_PCBC=m 587 581 CONFIG_CRYPTO_XTS=m 588 582 CONFIG_CRYPTO_AEGIS128=m 589 - CONFIG_CRYPTO_CHACHA20POLY1305=m 590 583 CONFIG_CRYPTO_MD4=m 591 584 CONFIG_CRYPTO_MICHAEL_MIC=m 592 585 CONFIG_CRYPTO_RMD160=m ··· 605 600 CONFIG_CRYPTO_USER_API_RNG=m 606 601 CONFIG_CRYPTO_USER_API_AEAD=m 607 602 # CONFIG_CRYPTO_HW is not set 603 + CONFIG_PRIME_NUMBERS=m 608 604 CONFIG_XZ_DEC_TEST=m 609 605 CONFIG_GLOB_SELFTEST=m 610 606 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 637 631 CONFIG_TEST_FIRMWARE=m 638 632 CONFIG_TEST_SYSCTL=m 639 633 CONFIG_LINEAR_RANGES_TEST=m 634 + CONFIG_CRC_BENCHMARK=y 640 635 CONFIG_TEST_UDELAY=m 641 636 CONFIG_TEST_STATIC_KEYS=m 642 637 CONFIG_TEST_KMOD=m

+8 -1

arch/m68k/configs/apollo_defconfig

··· 263 263 CONFIG_BRIDGE_EBT_SNAT=m 264 264 CONFIG_BRIDGE_EBT_LOG=m 265 265 CONFIG_BRIDGE_EBT_NFLOG=m 266 + CONFIG_IP_SCTP=m 266 267 CONFIG_SCTP_COOKIE_HMAC_SHA1=y 267 268 CONFIG_RDS=m 268 269 CONFIG_RDS_TCP=m ··· 337 336 CONFIG_NETDEVICES=y 338 337 CONFIG_DUMMY=m 339 338 CONFIG_WIREGUARD=m 339 + CONFIG_OVPN=m 340 340 CONFIG_EQUALIZER=m 341 341 CONFIG_NET_TEAM=m 342 342 CONFIG_NET_TEAM_MODE_BROADCAST=m ··· 357 355 CONFIG_MACSEC=m 358 356 CONFIG_NETCONSOLE=m 359 357 CONFIG_NETCONSOLE_DYNAMIC=y 358 + CONFIG_TUN=m 360 359 CONFIG_VETH=m 361 360 CONFIG_PPP=m 362 361 CONFIG_PPP_BSDCOMP=m ··· 408 405 CONFIG_DAX=m 409 406 CONFIG_EXT4_FS=y 410 407 CONFIG_JFS_FS=m 408 + CONFIG_XFS_FS=m 411 409 CONFIG_OCFS2_FS=m 412 410 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 411 + CONFIG_BTRFS_FS=m 413 412 CONFIG_BCACHEFS_FS=m 414 413 CONFIG_FANOTIFY=y 415 414 CONFIG_QUOTA_NETLINK_INTERFACE=y ··· 510 505 CONFIG_ENCRYPTED_KEYS=m 511 506 CONFIG_HARDENED_USERCOPY=y 512 507 CONFIG_CRYPTO_USER=m 508 + CONFIG_CRYPTO_NULL=m 513 509 CONFIG_CRYPTO_CRYPTD=m 514 510 CONFIG_CRYPTO_BENCHMARK=m 515 511 CONFIG_CRYPTO_RSA=m ··· 543 537 CONFIG_CRYPTO_PCBC=m 544 538 CONFIG_CRYPTO_XTS=m 545 539 CONFIG_CRYPTO_AEGIS128=m 546 - CONFIG_CRYPTO_CHACHA20POLY1305=m 547 540 CONFIG_CRYPTO_MD4=m 548 541 CONFIG_CRYPTO_MICHAEL_MIC=m 549 542 CONFIG_CRYPTO_RMD160=m ··· 562 557 CONFIG_CRYPTO_USER_API_RNG=m 563 558 CONFIG_CRYPTO_USER_API_AEAD=m 564 559 # CONFIG_CRYPTO_HW is not set 560 + CONFIG_PRIME_NUMBERS=m 565 561 CONFIG_XZ_DEC_TEST=m 566 562 CONFIG_GLOB_SELFTEST=m 567 563 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 594 588 CONFIG_TEST_FIRMWARE=m 595 589 CONFIG_TEST_SYSCTL=m 596 590 CONFIG_LINEAR_RANGES_TEST=m 591 + CONFIG_CRC_BENCHMARK=y 597 592 CONFIG_TEST_UDELAY=m 598 593 CONFIG_TEST_STATIC_KEYS=m 599 594 CONFIG_TEST_KMOD=m

+8 -1

arch/m68k/configs/atari_defconfig

··· 270 270 CONFIG_BRIDGE_EBT_SNAT=m 271 271 CONFIG_BRIDGE_EBT_LOG=m 272 272 CONFIG_BRIDGE_EBT_NFLOG=m 273 + CONFIG_IP_SCTP=m 273 274 CONFIG_SCTP_COOKIE_HMAC_SHA1=y 274 275 CONFIG_RDS=m 275 276 CONFIG_RDS_TCP=m ··· 352 351 CONFIG_NETDEVICES=y 353 352 CONFIG_DUMMY=m 354 353 CONFIG_WIREGUARD=m 354 + CONFIG_OVPN=m 355 355 CONFIG_EQUALIZER=m 356 356 CONFIG_NET_TEAM=m 357 357 CONFIG_NET_TEAM_MODE_BROADCAST=m ··· 372 370 CONFIG_MACSEC=m 373 371 CONFIG_NETCONSOLE=m 374 372 CONFIG_NETCONSOLE_DYNAMIC=y 373 + CONFIG_TUN=m 375 374 CONFIG_VETH=m 376 375 CONFIG_ATARILANCE=y 377 376 CONFIG_NE2000=y ··· 428 425 CONFIG_DAX=m 429 426 CONFIG_EXT4_FS=y 430 427 CONFIG_JFS_FS=m 428 + CONFIG_XFS_FS=m 431 429 CONFIG_OCFS2_FS=m 432 430 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 431 + CONFIG_BTRFS_FS=m 433 432 CONFIG_BCACHEFS_FS=m 434 433 CONFIG_FANOTIFY=y 435 434 CONFIG_QUOTA_NETLINK_INTERFACE=y ··· 530 525 CONFIG_ENCRYPTED_KEYS=m 531 526 CONFIG_HARDENED_USERCOPY=y 532 527 CONFIG_CRYPTO_USER=m 528 + CONFIG_CRYPTO_NULL=m 533 529 CONFIG_CRYPTO_CRYPTD=m 534 530 CONFIG_CRYPTO_BENCHMARK=m 535 531 CONFIG_CRYPTO_RSA=m ··· 563 557 CONFIG_CRYPTO_PCBC=m 564 558 CONFIG_CRYPTO_XTS=m 565 559 CONFIG_CRYPTO_AEGIS128=m 566 - CONFIG_CRYPTO_CHACHA20POLY1305=m 567 560 CONFIG_CRYPTO_MD4=m 568 561 CONFIG_CRYPTO_MICHAEL_MIC=m 569 562 CONFIG_CRYPTO_RMD160=m ··· 582 577 CONFIG_CRYPTO_USER_API_RNG=m 583 578 CONFIG_CRYPTO_USER_API_AEAD=m 584 579 # CONFIG_CRYPTO_HW is not set 580 + CONFIG_PRIME_NUMBERS=m 585 581 CONFIG_XZ_DEC_TEST=m 586 582 CONFIG_GLOB_SELFTEST=m 587 583 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 614 608 CONFIG_TEST_FIRMWARE=m 615 609 CONFIG_TEST_SYSCTL=m 616 610 CONFIG_LINEAR_RANGES_TEST=m 611 + CONFIG_CRC_BENCHMARK=y 617 612 CONFIG_TEST_UDELAY=m 618 613 CONFIG_TEST_STATIC_KEYS=m 619 614 CONFIG_TEST_KMOD=m

+8 -1

arch/m68k/configs/bvme6000_defconfig

··· 260 260 CONFIG_BRIDGE_EBT_SNAT=m 261 261 CONFIG_BRIDGE_EBT_LOG=m 262 262 CONFIG_BRIDGE_EBT_NFLOG=m 263 + CONFIG_IP_SCTP=m 263 264 CONFIG_SCTP_COOKIE_HMAC_SHA1=y 264 265 CONFIG_RDS=m 265 266 CONFIG_RDS_TCP=m ··· 335 334 CONFIG_NETDEVICES=y 336 335 CONFIG_DUMMY=m 337 336 CONFIG_WIREGUARD=m 337 + CONFIG_OVPN=m 338 338 CONFIG_EQUALIZER=m 339 339 CONFIG_NET_TEAM=m 340 340 CONFIG_NET_TEAM_MODE_BROADCAST=m ··· 355 353 CONFIG_MACSEC=m 356 354 CONFIG_NETCONSOLE=m 357 355 CONFIG_NETCONSOLE_DYNAMIC=y 356 + CONFIG_TUN=m 358 357 CONFIG_VETH=m 359 358 CONFIG_BVME6000_NET=y 360 359 CONFIG_PPP=m ··· 400 397 CONFIG_DAX=m 401 398 CONFIG_EXT4_FS=y 402 399 CONFIG_JFS_FS=m 400 + CONFIG_XFS_FS=m 403 401 CONFIG_OCFS2_FS=m 404 402 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 403 + CONFIG_BTRFS_FS=m 405 404 CONFIG_BCACHEFS_FS=m 406 405 CONFIG_FANOTIFY=y 407 406 CONFIG_QUOTA_NETLINK_INTERFACE=y ··· 502 497 CONFIG_ENCRYPTED_KEYS=m 503 498 CONFIG_HARDENED_USERCOPY=y 504 499 CONFIG_CRYPTO_USER=m 500 + CONFIG_CRYPTO_NULL=m 505 501 CONFIG_CRYPTO_CRYPTD=m 506 502 CONFIG_CRYPTO_BENCHMARK=m 507 503 CONFIG_CRYPTO_RSA=m ··· 535 529 CONFIG_CRYPTO_PCBC=m 536 530 CONFIG_CRYPTO_XTS=m 537 531 CONFIG_CRYPTO_AEGIS128=m 538 - CONFIG_CRYPTO_CHACHA20POLY1305=m 539 532 CONFIG_CRYPTO_MD4=m 540 533 CONFIG_CRYPTO_MICHAEL_MIC=m 541 534 CONFIG_CRYPTO_RMD160=m ··· 554 549 CONFIG_CRYPTO_USER_API_RNG=m 555 550 CONFIG_CRYPTO_USER_API_AEAD=m 556 551 # CONFIG_CRYPTO_HW is not set 552 + CONFIG_PRIME_NUMBERS=m 557 553 CONFIG_XZ_DEC_TEST=m 558 554 CONFIG_GLOB_SELFTEST=m 559 555 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 586 580 CONFIG_TEST_FIRMWARE=m 587 581 CONFIG_TEST_SYSCTL=m 588 582 CONFIG_LINEAR_RANGES_TEST=m 583 + CONFIG_CRC_BENCHMARK=y 589 584 CONFIG_TEST_UDELAY=m 590 585 CONFIG_TEST_STATIC_KEYS=m 591 586 CONFIG_TEST_KMOD=m

+8 -1

arch/m68k/configs/hp300_defconfig

··· 262 262 CONFIG_BRIDGE_EBT_SNAT=m 263 263 CONFIG_BRIDGE_EBT_LOG=m 264 264 CONFIG_BRIDGE_EBT_NFLOG=m 265 + CONFIG_IP_SCTP=m 265 266 CONFIG_SCTP_COOKIE_HMAC_SHA1=y 266 267 CONFIG_RDS=m 267 268 CONFIG_RDS_TCP=m ··· 336 335 CONFIG_NETDEVICES=y 337 336 CONFIG_DUMMY=m 338 337 CONFIG_WIREGUARD=m 338 + CONFIG_OVPN=m 339 339 CONFIG_EQUALIZER=m 340 340 CONFIG_NET_TEAM=m 341 341 CONFIG_NET_TEAM_MODE_BROADCAST=m ··· 356 354 CONFIG_MACSEC=m 357 355 CONFIG_NETCONSOLE=m 358 356 CONFIG_NETCONSOLE_DYNAMIC=y 357 + CONFIG_TUN=m 359 358 CONFIG_VETH=m 360 359 CONFIG_HPLANCE=y 361 360 CONFIG_PPP=m ··· 410 407 CONFIG_DAX=m 411 408 CONFIG_EXT4_FS=y 412 409 CONFIG_JFS_FS=m 410 + CONFIG_XFS_FS=m 413 411 CONFIG_OCFS2_FS=m 414 412 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 413 + CONFIG_BTRFS_FS=m 415 414 CONFIG_BCACHEFS_FS=m 416 415 CONFIG_FANOTIFY=y 417 416 CONFIG_QUOTA_NETLINK_INTERFACE=y ··· 512 507 CONFIG_ENCRYPTED_KEYS=m 513 508 CONFIG_HARDENED_USERCOPY=y 514 509 CONFIG_CRYPTO_USER=m 510 + CONFIG_CRYPTO_NULL=m 515 511 CONFIG_CRYPTO_CRYPTD=m 516 512 CONFIG_CRYPTO_BENCHMARK=m 517 513 CONFIG_CRYPTO_RSA=m ··· 545 539 CONFIG_CRYPTO_PCBC=m 546 540 CONFIG_CRYPTO_XTS=m 547 541 CONFIG_CRYPTO_AEGIS128=m 548 - CONFIG_CRYPTO_CHACHA20POLY1305=m 549 542 CONFIG_CRYPTO_MD4=m 550 543 CONFIG_CRYPTO_MICHAEL_MIC=m 551 544 CONFIG_CRYPTO_RMD160=m ··· 564 559 CONFIG_CRYPTO_USER_API_RNG=m 565 560 CONFIG_CRYPTO_USER_API_AEAD=m 566 561 # CONFIG_CRYPTO_HW is not set 562 + CONFIG_PRIME_NUMBERS=m 567 563 CONFIG_XZ_DEC_TEST=m 568 564 CONFIG_GLOB_SELFTEST=m 569 565 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 596 590 CONFIG_TEST_FIRMWARE=m 597 591 CONFIG_TEST_SYSCTL=m 598 592 CONFIG_LINEAR_RANGES_TEST=m 593 + CONFIG_CRC_BENCHMARK=y 599 594 CONFIG_TEST_UDELAY=m 600 595 CONFIG_TEST_STATIC_KEYS=m 601 596 CONFIG_TEST_KMOD=m

+8 -1

arch/m68k/configs/mac_defconfig

··· 261 261 CONFIG_BRIDGE_EBT_SNAT=m 262 262 CONFIG_BRIDGE_EBT_LOG=m 263 263 CONFIG_BRIDGE_EBT_NFLOG=m 264 + CONFIG_IP_SCTP=m 264 265 CONFIG_SCTP_COOKIE_HMAC_SHA1=y 265 266 CONFIG_RDS=m 266 267 CONFIG_RDS_TCP=m ··· 348 347 CONFIG_NETDEVICES=y 349 348 CONFIG_DUMMY=m 350 349 CONFIG_WIREGUARD=m 350 + CONFIG_OVPN=m 351 351 CONFIG_EQUALIZER=m 352 352 CONFIG_NET_TEAM=m 353 353 CONFIG_NET_TEAM_MODE_BROADCAST=m ··· 368 366 CONFIG_MACSEC=m 369 367 CONFIG_NETCONSOLE=m 370 368 CONFIG_NETCONSOLE_DYNAMIC=y 369 + CONFIG_TUN=m 371 370 CONFIG_VETH=m 372 371 CONFIG_MACMACE=y 373 372 CONFIG_MAC89x0=y ··· 427 424 CONFIG_DAX=m 428 425 CONFIG_EXT4_FS=y 429 426 CONFIG_JFS_FS=m 427 + CONFIG_XFS_FS=m 430 428 CONFIG_OCFS2_FS=m 431 429 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 430 + CONFIG_BTRFS_FS=m 432 431 CONFIG_BCACHEFS_FS=m 433 432 CONFIG_FANOTIFY=y 434 433 CONFIG_QUOTA_NETLINK_INTERFACE=y ··· 529 524 CONFIG_ENCRYPTED_KEYS=m 530 525 CONFIG_HARDENED_USERCOPY=y 531 526 CONFIG_CRYPTO_USER=m 527 + CONFIG_CRYPTO_NULL=m 532 528 CONFIG_CRYPTO_CRYPTD=m 533 529 CONFIG_CRYPTO_BENCHMARK=m 534 530 CONFIG_CRYPTO_RSA=m ··· 562 556 CONFIG_CRYPTO_PCBC=m 563 557 CONFIG_CRYPTO_XTS=m 564 558 CONFIG_CRYPTO_AEGIS128=m 565 - CONFIG_CRYPTO_CHACHA20POLY1305=m 566 559 CONFIG_CRYPTO_MD4=m 567 560 CONFIG_CRYPTO_MICHAEL_MIC=m 568 561 CONFIG_CRYPTO_RMD160=m ··· 581 576 CONFIG_CRYPTO_USER_API_RNG=m 582 577 CONFIG_CRYPTO_USER_API_AEAD=m 583 578 # CONFIG_CRYPTO_HW is not set 579 + CONFIG_PRIME_NUMBERS=m 584 580 CONFIG_XZ_DEC_TEST=m 585 581 CONFIG_GLOB_SELFTEST=m 586 582 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 613 607 CONFIG_TEST_FIRMWARE=m 614 608 CONFIG_TEST_SYSCTL=m 615 609 CONFIG_LINEAR_RANGES_TEST=m 610 + CONFIG_CRC_BENCHMARK=y 616 611 CONFIG_TEST_UDELAY=m 617 612 CONFIG_TEST_STATIC_KEYS=m 618 613 CONFIG_TEST_KMOD=m

+8 -1

arch/m68k/configs/multi_defconfig

··· 281 281 CONFIG_BRIDGE_EBT_SNAT=m 282 282 CONFIG_BRIDGE_EBT_LOG=m 283 283 CONFIG_BRIDGE_EBT_NFLOG=m 284 + CONFIG_IP_SCTP=m 284 285 CONFIG_SCTP_COOKIE_HMAC_SHA1=y 285 286 CONFIG_RDS=m 286 287 CONFIG_RDS_TCP=m ··· 391 390 CONFIG_NETDEVICES=y 392 391 CONFIG_DUMMY=m 393 392 CONFIG_WIREGUARD=m 393 + CONFIG_OVPN=m 394 394 CONFIG_EQUALIZER=m 395 395 CONFIG_NET_TEAM=m 396 396 CONFIG_NET_TEAM_MODE_BROADCAST=m ··· 411 409 CONFIG_MACSEC=m 412 410 CONFIG_NETCONSOLE=m 413 411 CONFIG_NETCONSOLE_DYNAMIC=y 412 + CONFIG_TUN=m 414 413 CONFIG_VETH=m 415 414 CONFIG_A2065=y 416 415 CONFIG_ARIADNE=y ··· 514 511 CONFIG_DAX=m 515 512 CONFIG_EXT4_FS=y 516 513 CONFIG_JFS_FS=m 514 + CONFIG_XFS_FS=m 517 515 CONFIG_OCFS2_FS=m 518 516 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 517 + CONFIG_BTRFS_FS=m 519 518 CONFIG_BCACHEFS_FS=m 520 519 CONFIG_FANOTIFY=y 521 520 CONFIG_QUOTA_NETLINK_INTERFACE=y ··· 616 611 CONFIG_ENCRYPTED_KEYS=m 617 612 CONFIG_HARDENED_USERCOPY=y 618 613 CONFIG_CRYPTO_USER=m 614 + CONFIG_CRYPTO_NULL=m 619 615 CONFIG_CRYPTO_CRYPTD=m 620 616 CONFIG_CRYPTO_BENCHMARK=m 621 617 CONFIG_CRYPTO_RSA=m ··· 649 643 CONFIG_CRYPTO_PCBC=m 650 644 CONFIG_CRYPTO_XTS=m 651 645 CONFIG_CRYPTO_AEGIS128=m 652 - CONFIG_CRYPTO_CHACHA20POLY1305=m 653 646 CONFIG_CRYPTO_MD4=m 654 647 CONFIG_CRYPTO_MICHAEL_MIC=m 655 648 CONFIG_CRYPTO_RMD160=m ··· 668 663 CONFIG_CRYPTO_USER_API_RNG=m 669 664 CONFIG_CRYPTO_USER_API_AEAD=m 670 665 # CONFIG_CRYPTO_HW is not set 666 + CONFIG_PRIME_NUMBERS=m 671 667 CONFIG_XZ_DEC_TEST=m 672 668 CONFIG_GLOB_SELFTEST=m 673 669 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 700 694 CONFIG_TEST_FIRMWARE=m 701 695 CONFIG_TEST_SYSCTL=m 702 696 CONFIG_LINEAR_RANGES_TEST=m 697 + CONFIG_CRC_BENCHMARK=y 703 698 CONFIG_TEST_UDELAY=m 704 699 CONFIG_TEST_STATIC_KEYS=m 705 700 CONFIG_TEST_KMOD=m

+8 -1

arch/m68k/configs/mvme147_defconfig

··· 259 259 CONFIG_BRIDGE_EBT_SNAT=m 260 260 CONFIG_BRIDGE_EBT_LOG=m 261 261 CONFIG_BRIDGE_EBT_NFLOG=m 262 + CONFIG_IP_SCTP=m 262 263 CONFIG_SCTP_COOKIE_HMAC_SHA1=y 263 264 CONFIG_RDS=m 264 265 CONFIG_RDS_TCP=m ··· 334 333 CONFIG_NETDEVICES=y 335 334 CONFIG_DUMMY=m 336 335 CONFIG_WIREGUARD=m 336 + CONFIG_OVPN=m 337 337 CONFIG_EQUALIZER=m 338 338 CONFIG_NET_TEAM=m 339 339 CONFIG_NET_TEAM_MODE_BROADCAST=m ··· 354 352 CONFIG_MACSEC=m 355 353 CONFIG_NETCONSOLE=m 356 354 CONFIG_NETCONSOLE_DYNAMIC=y 355 + CONFIG_TUN=m 357 356 CONFIG_VETH=m 358 357 CONFIG_MVME147_NET=y 359 358 CONFIG_PPP=m ··· 400 397 CONFIG_DAX=m 401 398 CONFIG_EXT4_FS=y 402 399 CONFIG_JFS_FS=m 400 + CONFIG_XFS_FS=m 403 401 CONFIG_OCFS2_FS=m 404 402 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 403 + CONFIG_BTRFS_FS=m 405 404 CONFIG_BCACHEFS_FS=m 406 405 CONFIG_FANOTIFY=y 407 406 CONFIG_QUOTA_NETLINK_INTERFACE=y ··· 502 497 CONFIG_ENCRYPTED_KEYS=m 503 498 CONFIG_HARDENED_USERCOPY=y 504 499 CONFIG_CRYPTO_USER=m 500 + CONFIG_CRYPTO_NULL=m 505 501 CONFIG_CRYPTO_CRYPTD=m 506 502 CONFIG_CRYPTO_BENCHMARK=m 507 503 CONFIG_CRYPTO_RSA=m ··· 535 529 CONFIG_CRYPTO_PCBC=m 536 530 CONFIG_CRYPTO_XTS=m 537 531 CONFIG_CRYPTO_AEGIS128=m 538 - CONFIG_CRYPTO_CHACHA20POLY1305=m 539 532 CONFIG_CRYPTO_MD4=m 540 533 CONFIG_CRYPTO_MICHAEL_MIC=m 541 534 CONFIG_CRYPTO_RMD160=m ··· 554 549 CONFIG_CRYPTO_USER_API_RNG=m 555 550 CONFIG_CRYPTO_USER_API_AEAD=m 556 551 # CONFIG_CRYPTO_HW is not set 552 + CONFIG_PRIME_NUMBERS=m 557 553 CONFIG_XZ_DEC_TEST=m 558 554 CONFIG_GLOB_SELFTEST=m 559 555 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 586 580 CONFIG_TEST_FIRMWARE=m 587 581 CONFIG_TEST_SYSCTL=m 588 582 CONFIG_LINEAR_RANGES_TEST=m 583 + CONFIG_CRC_BENCHMARK=y 589 584 CONFIG_TEST_UDELAY=m 590 585 CONFIG_TEST_STATIC_KEYS=m 591 586 CONFIG_TEST_KMOD=m

+8 -1

arch/m68k/configs/mvme16x_defconfig

··· 260 260 CONFIG_BRIDGE_EBT_SNAT=m 261 261 CONFIG_BRIDGE_EBT_LOG=m 262 262 CONFIG_BRIDGE_EBT_NFLOG=m 263 + CONFIG_IP_SCTP=m 263 264 CONFIG_SCTP_COOKIE_HMAC_SHA1=y 264 265 CONFIG_RDS=m 265 266 CONFIG_RDS_TCP=m ··· 335 334 CONFIG_NETDEVICES=y 336 335 CONFIG_DUMMY=m 337 336 CONFIG_WIREGUARD=m 337 + CONFIG_OVPN=m 338 338 CONFIG_EQUALIZER=m 339 339 CONFIG_NET_TEAM=m 340 340 CONFIG_NET_TEAM_MODE_BROADCAST=m ··· 355 353 CONFIG_MACSEC=m 356 354 CONFIG_NETCONSOLE=m 357 355 CONFIG_NETCONSOLE_DYNAMIC=y 356 + CONFIG_TUN=m 358 357 CONFIG_VETH=m 359 358 CONFIG_MVME16x_NET=y 360 359 CONFIG_PPP=m ··· 401 398 CONFIG_DAX=m 402 399 CONFIG_EXT4_FS=y 403 400 CONFIG_JFS_FS=m 401 + CONFIG_XFS_FS=m 404 402 CONFIG_OCFS2_FS=m 405 403 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 404 + CONFIG_BTRFS_FS=m 406 405 CONFIG_BCACHEFS_FS=m 407 406 CONFIG_FANOTIFY=y 408 407 CONFIG_QUOTA_NETLINK_INTERFACE=y ··· 503 498 CONFIG_ENCRYPTED_KEYS=m 504 499 CONFIG_HARDENED_USERCOPY=y 505 500 CONFIG_CRYPTO_USER=m 501 + CONFIG_CRYPTO_NULL=m 506 502 CONFIG_CRYPTO_CRYPTD=m 507 503 CONFIG_CRYPTO_BENCHMARK=m 508 504 CONFIG_CRYPTO_RSA=m ··· 536 530 CONFIG_CRYPTO_PCBC=m 537 531 CONFIG_CRYPTO_XTS=m 538 532 CONFIG_CRYPTO_AEGIS128=m 539 - CONFIG_CRYPTO_CHACHA20POLY1305=m 540 533 CONFIG_CRYPTO_MD4=m 541 534 CONFIG_CRYPTO_MICHAEL_MIC=m 542 535 CONFIG_CRYPTO_RMD160=m ··· 555 550 CONFIG_CRYPTO_USER_API_RNG=m 556 551 CONFIG_CRYPTO_USER_API_AEAD=m 557 552 # CONFIG_CRYPTO_HW is not set 553 + CONFIG_PRIME_NUMBERS=m 558 554 CONFIG_XZ_DEC_TEST=m 559 555 CONFIG_GLOB_SELFTEST=m 560 556 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 587 581 CONFIG_TEST_FIRMWARE=m 588 582 CONFIG_TEST_SYSCTL=m 589 583 CONFIG_LINEAR_RANGES_TEST=m 584 + CONFIG_CRC_BENCHMARK=y 590 585 CONFIG_TEST_UDELAY=m 591 586 CONFIG_TEST_STATIC_KEYS=m 592 587 CONFIG_TEST_KMOD=m

+8 -1

arch/m68k/configs/q40_defconfig

··· 261 261 CONFIG_BRIDGE_EBT_SNAT=m 262 262 CONFIG_BRIDGE_EBT_LOG=m 263 263 CONFIG_BRIDGE_EBT_NFLOG=m 264 + CONFIG_IP_SCTP=m 264 265 CONFIG_SCTP_COOKIE_HMAC_SHA1=y 265 266 CONFIG_RDS=m 266 267 CONFIG_RDS_TCP=m ··· 341 340 CONFIG_NETDEVICES=y 342 341 CONFIG_DUMMY=m 343 342 CONFIG_WIREGUARD=m 343 + CONFIG_OVPN=m 344 344 CONFIG_EQUALIZER=m 345 345 CONFIG_NET_TEAM=m 346 346 CONFIG_NET_TEAM_MODE_BROADCAST=m ··· 361 359 CONFIG_MACSEC=m 362 360 CONFIG_NETCONSOLE=m 363 361 CONFIG_NETCONSOLE_DYNAMIC=y 362 + CONFIG_TUN=m 364 363 CONFIG_VETH=m 365 364 CONFIG_NE2000=y 366 365 CONFIG_PLIP=m ··· 417 414 CONFIG_DAX=m 418 415 CONFIG_EXT4_FS=y 419 416 CONFIG_JFS_FS=m 417 + CONFIG_XFS_FS=m 420 418 CONFIG_OCFS2_FS=m 421 419 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 420 + CONFIG_BTRFS_FS=m 422 421 CONFIG_BCACHEFS_FS=m 423 422 CONFIG_FANOTIFY=y 424 423 CONFIG_QUOTA_NETLINK_INTERFACE=y ··· 519 514 CONFIG_ENCRYPTED_KEYS=m 520 515 CONFIG_HARDENED_USERCOPY=y 521 516 CONFIG_CRYPTO_USER=m 517 + CONFIG_CRYPTO_NULL=m 522 518 CONFIG_CRYPTO_CRYPTD=m 523 519 CONFIG_CRYPTO_BENCHMARK=m 524 520 CONFIG_CRYPTO_RSA=m ··· 552 546 CONFIG_CRYPTO_PCBC=m 553 547 CONFIG_CRYPTO_XTS=m 554 548 CONFIG_CRYPTO_AEGIS128=m 555 - CONFIG_CRYPTO_CHACHA20POLY1305=m 556 549 CONFIG_CRYPTO_MD4=m 557 550 CONFIG_CRYPTO_MICHAEL_MIC=m 558 551 CONFIG_CRYPTO_RMD160=m ··· 571 566 CONFIG_CRYPTO_USER_API_RNG=m 572 567 CONFIG_CRYPTO_USER_API_AEAD=m 573 568 # CONFIG_CRYPTO_HW is not set 569 + CONFIG_PRIME_NUMBERS=m 574 570 CONFIG_XZ_DEC_TEST=m 575 571 CONFIG_GLOB_SELFTEST=m 576 572 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 603 597 CONFIG_TEST_FIRMWARE=m 604 598 CONFIG_TEST_SYSCTL=m 605 599 CONFIG_LINEAR_RANGES_TEST=m 600 + CONFIG_CRC_BENCHMARK=y 606 601 CONFIG_TEST_UDELAY=m 607 602 CONFIG_TEST_STATIC_KEYS=m 608 603 CONFIG_TEST_KMOD=m

+8 -1

arch/m68k/configs/sun3_defconfig

··· 256 256 CONFIG_BRIDGE_EBT_SNAT=m 257 257 CONFIG_BRIDGE_EBT_LOG=m 258 258 CONFIG_BRIDGE_EBT_NFLOG=m 259 + CONFIG_IP_SCTP=m 259 260 CONFIG_SCTP_COOKIE_HMAC_SHA1=y 260 261 CONFIG_RDS=m 261 262 CONFIG_RDS_TCP=m ··· 331 330 CONFIG_NETDEVICES=y 332 331 CONFIG_DUMMY=m 333 332 CONFIG_WIREGUARD=m 333 + CONFIG_OVPN=m 334 334 CONFIG_EQUALIZER=m 335 335 CONFIG_NET_TEAM=m 336 336 CONFIG_NET_TEAM_MODE_BROADCAST=m ··· 351 349 CONFIG_MACSEC=m 352 350 CONFIG_NETCONSOLE=m 353 351 CONFIG_NETCONSOLE_DYNAMIC=y 352 + CONFIG_TUN=m 354 353 CONFIG_VETH=m 355 354 CONFIG_SUN3LANCE=y 356 355 CONFIG_SUN3_82586=y ··· 398 395 CONFIG_DAX=m 399 396 CONFIG_EXT4_FS=y 400 397 CONFIG_JFS_FS=m 398 + CONFIG_XFS_FS=m 401 399 CONFIG_OCFS2_FS=m 402 400 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 401 + CONFIG_BTRFS_FS=m 403 402 CONFIG_BCACHEFS_FS=m 404 403 CONFIG_FANOTIFY=y 405 404 CONFIG_QUOTA_NETLINK_INTERFACE=y ··· 500 495 CONFIG_ENCRYPTED_KEYS=m 501 496 CONFIG_HARDENED_USERCOPY=y 502 497 CONFIG_CRYPTO_USER=m 498 + CONFIG_CRYPTO_NULL=m 503 499 CONFIG_CRYPTO_CRYPTD=m 504 500 CONFIG_CRYPTO_BENCHMARK=m 505 501 CONFIG_CRYPTO_RSA=m ··· 533 527 CONFIG_CRYPTO_PCBC=m 534 528 CONFIG_CRYPTO_XTS=m 535 529 CONFIG_CRYPTO_AEGIS128=m 536 - CONFIG_CRYPTO_CHACHA20POLY1305=m 537 530 CONFIG_CRYPTO_MD4=m 538 531 CONFIG_CRYPTO_MICHAEL_MIC=m 539 532 CONFIG_CRYPTO_RMD160=m ··· 552 547 CONFIG_CRYPTO_USER_API_RNG=m 553 548 CONFIG_CRYPTO_USER_API_AEAD=m 554 549 # CONFIG_CRYPTO_HW is not set 550 + CONFIG_PRIME_NUMBERS=m 555 551 CONFIG_XZ_DEC_TEST=m 556 552 CONFIG_GLOB_SELFTEST=m 557 553 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 583 577 CONFIG_TEST_FIRMWARE=m 584 578 CONFIG_TEST_SYSCTL=m 585 579 CONFIG_LINEAR_RANGES_TEST=m 580 + CONFIG_CRC_BENCHMARK=y 586 581 CONFIG_TEST_UDELAY=m 587 582 CONFIG_TEST_STATIC_KEYS=m 588 583 CONFIG_TEST_KMOD=m

+8 -1

arch/m68k/configs/sun3x_defconfig

··· 257 257 CONFIG_BRIDGE_EBT_SNAT=m 258 258 CONFIG_BRIDGE_EBT_LOG=m 259 259 CONFIG_BRIDGE_EBT_NFLOG=m 260 + CONFIG_IP_SCTP=m 260 261 CONFIG_SCTP_COOKIE_HMAC_SHA1=y 261 262 CONFIG_RDS=m 262 263 CONFIG_RDS_TCP=m ··· 332 331 CONFIG_NETDEVICES=y 333 332 CONFIG_DUMMY=m 334 333 CONFIG_WIREGUARD=m 334 + CONFIG_OVPN=m 335 335 CONFIG_EQUALIZER=m 336 336 CONFIG_NET_TEAM=m 337 337 CONFIG_NET_TEAM_MODE_BROADCAST=m ··· 352 350 CONFIG_MACSEC=m 353 351 CONFIG_NETCONSOLE=m 354 352 CONFIG_NETCONSOLE_DYNAMIC=y 353 + CONFIG_TUN=m 355 354 CONFIG_VETH=m 356 355 CONFIG_SUN3LANCE=y 357 356 CONFIG_PPP=m ··· 398 395 CONFIG_DAX=m 399 396 CONFIG_EXT4_FS=y 400 397 CONFIG_JFS_FS=m 398 + CONFIG_XFS_FS=m 401 399 CONFIG_OCFS2_FS=m 402 400 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 401 + CONFIG_BTRFS_FS=m 403 402 CONFIG_BCACHEFS_FS=m 404 403 CONFIG_FANOTIFY=y 405 404 CONFIG_QUOTA_NETLINK_INTERFACE=y ··· 500 495 CONFIG_ENCRYPTED_KEYS=m 501 496 CONFIG_HARDENED_USERCOPY=y 502 497 CONFIG_CRYPTO_USER=m 498 + CONFIG_CRYPTO_NULL=m 503 499 CONFIG_CRYPTO_CRYPTD=m 504 500 CONFIG_CRYPTO_BENCHMARK=m 505 501 CONFIG_CRYPTO_RSA=m ··· 533 527 CONFIG_CRYPTO_PCBC=m 534 528 CONFIG_CRYPTO_XTS=m 535 529 CONFIG_CRYPTO_AEGIS128=m 536 - CONFIG_CRYPTO_CHACHA20POLY1305=m 537 530 CONFIG_CRYPTO_MD4=m 538 531 CONFIG_CRYPTO_MICHAEL_MIC=m 539 532 CONFIG_CRYPTO_RMD160=m ··· 552 547 CONFIG_CRYPTO_USER_API_RNG=m 553 548 CONFIG_CRYPTO_USER_API_AEAD=m 554 549 # CONFIG_CRYPTO_HW is not set 550 + CONFIG_PRIME_NUMBERS=m 555 551 CONFIG_XZ_DEC_TEST=m 556 552 CONFIG_GLOB_SELFTEST=m 557 553 # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set ··· 584 578 CONFIG_TEST_FIRMWARE=m 585 579 CONFIG_TEST_SYSCTL=m 586 580 CONFIG_LINEAR_RANGES_TEST=m 581 + CONFIG_CRC_BENCHMARK=y 587 582 CONFIG_TEST_UDELAY=m 588 583 CONFIG_TEST_STATIC_KEYS=m 589 584 CONFIG_TEST_KMOD=m

+2 -2

arch/m68k/include/asm/adb_iop.h

··· 33 33 #define ADB_IOP_SRQ 0x04 /* SRQ detected */ 34 34 #define ADB_IOP_TIMEOUT 0x02 /* nonzero if timeout */ 35 35 36 - #ifndef __ASSEMBLY__ 36 + #ifndef __ASSEMBLER__ 37 37 38 38 struct adb_iopmsg { 39 39 __u8 flags; /* ADB flags */ ··· 43 43 __u8 spare[21]; /* spare */ 44 44 }; 45 45 46 - #endif /* __ASSEMBLY__ */ 46 + #endif /* __ASSEMBLER__ */

+2 -2

arch/m68k/include/asm/bootinfo.h

··· 14 14 #include <uapi/asm/bootinfo.h> 15 15 16 16 17 - #ifndef __ASSEMBLY__ 17 + #ifndef __ASSEMBLER__ 18 18 19 19 #ifdef CONFIG_BOOTINFO_PROC 20 20 extern void save_bootinfo(const struct bi_record *bi); ··· 28 28 static inline void process_uboot_commandline(char *commandp, int size) {} 29 29 #endif 30 30 31 - #endif /* __ASSEMBLY__ */ 31 + #endif /* __ASSEMBLER__ */ 32 32 33 33 34 34 #endif /* _M68K_BOOTINFO_H */

+2 -2

arch/m68k/include/asm/entry.h

··· 4 4 5 5 #include <asm/setup.h> 6 6 #include <asm/page.h> 7 - #ifdef __ASSEMBLY__ 7 + #ifdef __ASSEMBLER__ 8 8 #include <asm/thread_info.h> 9 9 #endif 10 10 ··· 41 41 #define ALLOWINT (~0x700) 42 42 #endif /* machine compilation types */ 43 43 44 - #ifdef __ASSEMBLY__ 44 + #ifdef __ASSEMBLER__ 45 45 /* 46 46 * This defines the normal kernel pt-regs layout. 47 47 *

+2 -2

arch/m68k/include/asm/kexec.h

··· 15 15 16 16 #define KEXEC_ARCH KEXEC_ARCH_68K 17 17 18 - #ifndef __ASSEMBLY__ 18 + #ifndef __ASSEMBLER__ 19 19 20 20 static inline void crash_setup_regs(struct pt_regs *newregs, 21 21 struct pt_regs *oldregs) ··· 23 23 /* Dummy implementation for now */ 24 24 } 25 25 26 - #endif /* __ASSEMBLY__ */ 26 + #endif /* __ASSEMBLER__ */ 27 27 28 28 #endif /* CONFIG_KEXEC_CORE */ 29 29

+2 -2

arch/m68k/include/asm/mac_baboon.h

··· 5 5 6 6 #define BABOON_BASE (0x50F1A000) /* same as IDE controller base */ 7 7 8 - #ifndef __ASSEMBLY__ 8 + #ifndef __ASSEMBLER__ 9 9 10 10 struct baboon { 11 11 char pad1[208]; /* generic IDE registers, not used here */ ··· 36 36 extern void baboon_irq_enable(int); 37 37 extern void baboon_irq_disable(int); 38 38 39 - #endif /* __ASSEMBLY **/ 39 + #endif /* __ASSEMBLER__ */

+2 -2

arch/m68k/include/asm/mac_iop.h

··· 66 66 #define IOP_ADDR_ALIVE 0x031F 67 67 #define IOP_ADDR_RECV_MSG 0x0320 68 68 69 - #ifndef __ASSEMBLY__ 69 + #ifndef __ASSEMBLER__ 70 70 71 71 /* 72 72 * IOP Control registers, staggered because in usual Apple style they were ··· 163 163 164 164 extern void iop_register_interrupts(void); 165 165 166 - #endif /* __ASSEMBLY__ */ 166 + #endif /* __ASSEMBLER__ */

+2 -2

arch/m68k/include/asm/mac_oss.h

··· 59 59 60 60 #define OSS_POWEROFF 0x80 61 61 62 - #ifndef __ASSEMBLY__ 62 + #ifndef __ASSEMBLER__ 63 63 64 64 struct mac_oss { 65 65 __u8 irq_level[0x10]; /* [0x000-0x00f] Interrupt levels */ ··· 77 77 extern void oss_irq_enable(int); 78 78 extern void oss_irq_disable(int); 79 79 80 - #endif /* __ASSEMBLY__ */ 80 + #endif /* __ASSEMBLER__ */

+2 -2

arch/m68k/include/asm/mac_psc.h

··· 207 207 * Unknown, always 0x0000. 208 208 */ 209 209 210 - #ifndef __ASSEMBLY__ 210 + #ifndef __ASSEMBLER__ 211 211 212 212 extern volatile __u8 *psc; 213 213 ··· 249 249 return *((volatile __u32 *)(psc + offset)); 250 250 } 251 251 252 - #endif /* __ASSEMBLY__ */ 252 + #endif /* __ASSEMBLER__ */

+2 -2

arch/m68k/include/asm/mac_via.h

··· 250 250 #define IER_SET_BIT(b) (0x80 | (1<<(b)) ) 251 251 #define IER_CLR_BIT(b) (0x7F & (1<<(b)) ) 252 252 253 - #ifndef __ASSEMBLY__ 253 + #ifndef __ASSEMBLER__ 254 254 255 255 extern volatile __u8 *via1,*via2; 256 256 extern int rbv_present,via_alt_mapping; ··· 267 267 extern void via1_set_head(int); 268 268 extern int via2_scsi_drq_pending(void); 269 269 270 - #endif /* __ASSEMBLY__ */ 270 + #endif /* __ASSEMBLER__ */ 271 271 272 272 #endif /* _ASM_MAC_VIA_H_ */

+3 -3

arch/m68k/include/asm/math-emu.h

··· 67 67 #define PMUNIMPL (1<<PUNIMPL) 68 68 #define PMMOVEM (1<<PMOVEM) 69 69 70 - #ifndef __ASSEMBLY__ 70 + #ifndef __ASSEMBLER__ 71 71 72 72 #include <linux/kernel.h> 73 73 #include <linux/sched.h> ··· 127 127 128 128 #define FPDATA ((struct fp_data *)current->thread.fp) 129 129 130 - #else /* __ASSEMBLY__ */ 130 + #else /* __ASSEMBLER__ */ 131 131 132 132 #define FPDATA %a2 133 133 ··· 311 311 .endm 312 312 313 313 314 - #endif /* __ASSEMBLY__ */ 314 + #endif /* __ASSEMBLER__ */ 315 315 316 316 #endif /* _ASM_M68K_SETUP_H */

+2 -2

arch/m68k/include/asm/mcf_pgtable.h

··· 92 92 #define PTE_MASK PAGE_MASK 93 93 #define CF_PAGE_CHG_MASK (PTE_MASK | CF_PAGE_ACCESSED | CF_PAGE_DIRTY) 94 94 95 - #ifndef __ASSEMBLY__ 95 + #ifndef __ASSEMBLER__ 96 96 97 97 #define pmd_pgtable(pmd) pfn_to_virt(pmd_val(pmd) >> PAGE_SHIFT) 98 98 ··· 292 292 #define pfn_pte(pfn, prot) __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot)) 293 293 #define pte_pfn(pte) (pte_val(pte) >> PAGE_SHIFT) 294 294 295 - #endif /* !__ASSEMBLY__ */ 295 + #endif /* !__ASSEMBLER__ */ 296 296 #endif /* _MCF_PGTABLE_H */

+1 -1

arch/m68k/include/asm/mcfmmu.h

··· 88 88 #define MMUDR_PAN 10 /* Physical address */ 89 89 #define MMUDR_PAMASK 0xfffffc00 /* PA mask */ 90 90 91 - #ifndef __ASSEMBLY__ 91 + #ifndef __ASSEMBLER__ 92 92 93 93 /* 94 94 * Simple access functions for the MMU registers. Nothing fancy

+2 -2

arch/m68k/include/asm/motorola_pgtable.h

··· 44 44 /* We borrow bit 11 to store the exclusive marker in swap PTEs. */ 45 45 #define _PAGE_SWP_EXCLUSIVE 0x800 46 46 47 - #ifndef __ASSEMBLY__ 47 + #ifndef __ASSEMBLER__ 48 48 49 49 /* This is the cache mode to be used for pages containing page descriptors for 50 50 * processors >= '040. It is in pte_mknocache(), and the variable is defined ··· 202 202 return pte; 203 203 } 204 204 205 - #endif /* !__ASSEMBLY__ */ 205 + #endif /* !__ASSEMBLER__ */ 206 206 #endif /* _MOTOROLA_PGTABLE_H */

+2 -2

arch/m68k/include/asm/nettel.h

··· 38 38 39 39 #define NETtel_LEDADDR 0x30400000 40 40 41 - #ifndef __ASSEMBLY__ 41 + #ifndef __ASSEMBLER__ 42 42 43 43 extern volatile unsigned short ppdata; 44 44 ··· 80 80 #define MCFPP_DTR0 0x0040 81 81 #define MCFPP_DTR1 0x0000 /* Port 1 no DTR support */ 82 82 83 - #ifndef __ASSEMBLY__ 83 + #ifndef __ASSEMBLER__ 84 84 /* 85 85 * These functions defined to give quasi generic access to the 86 86 * PPIO bits used for DTR/DCD.

+2 -2

arch/m68k/include/asm/openprom.h

··· 21 21 #define LINUX_OPPROM_MAGIC 0x10010407 22 22 #endif 23 23 24 - #ifndef __ASSEMBLY__ 24 + #ifndef __ASSEMBLER__ 25 25 /* V0 prom device operations. */ 26 26 struct linux_dev_v0_funcs { 27 27 int (*v0_devopen)(char *device_str); ··· 308 308 unsigned int or_size; 309 309 }; 310 310 311 - #endif /* !(__ASSEMBLY__) */ 311 + #endif /* !(__ASSEMBLER__) */ 312 312 313 313 #endif /* !(__SPARC_OPENPROM_H) */

+2 -2

arch/m68k/include/asm/page.h

··· 10 10 11 11 #define PAGE_OFFSET (PAGE_OFFSET_RAW) 12 12 13 - #ifndef __ASSEMBLY__ 13 + #ifndef __ASSEMBLER__ 14 14 15 15 /* 16 16 * These are used to make use of C type-checking.. ··· 48 48 extern unsigned long _ramstart; 49 49 extern unsigned long _ramend; 50 50 51 - #endif /* !__ASSEMBLY__ */ 51 + #endif /* !__ASSEMBLER__ */ 52 52 53 53 #ifdef CONFIG_MMU 54 54 #include <asm/page_mm.h>

+2 -2

arch/m68k/include/asm/page_mm.h

··· 2 2 #ifndef _M68K_PAGE_MM_H 3 3 #define _M68K_PAGE_MM_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 7 7 #include <linux/compiler.h> 8 8 #include <asm/module.h> ··· 144 144 #define virt_addr_valid(kaddr) ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory) 145 145 #define pfn_valid(pfn) virt_addr_valid(pfn_to_virt(pfn)) 146 146 147 - #endif /* __ASSEMBLY__ */ 147 + #endif /* __ASSEMBLER__ */ 148 148 149 149 #endif /* _M68K_PAGE_MM_H */

+2 -2

arch/m68k/include/asm/page_no.h

··· 2 2 #ifndef _M68K_PAGE_NO_H 3 3 #define _M68K_PAGE_NO_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 7 7 extern unsigned long memory_start; 8 8 extern unsigned long memory_end; ··· 37 37 38 38 #define ARCH_PFN_OFFSET PHYS_PFN(PAGE_OFFSET_RAW) 39 39 40 - #endif /* __ASSEMBLY__ */ 40 + #endif /* __ASSEMBLER__ */ 41 41 42 42 #endif /* _M68K_PAGE_NO_H */

+1 -1

arch/m68k/include/asm/pgtable.h

··· 10 10 #include <asm/pgtable_mm.h> 11 11 #endif 12 12 13 - #ifndef __ASSEMBLY__ 13 + #ifndef __ASSEMBLER__ 14 14 extern void paging_init(void); 15 15 #endif 16 16

+4 -4

arch/m68k/include/asm/pgtable_mm.h

··· 11 11 12 12 #include <asm/setup.h> 13 13 14 - #ifndef __ASSEMBLY__ 14 + #ifndef __ASSEMBLER__ 15 15 #include <asm/processor.h> 16 16 #include <linux/sched.h> 17 17 #include <linux/threads.h> ··· 145 145 #define update_mmu_cache(vma, addr, ptep) \ 146 146 update_mmu_cache_range(NULL, vma, addr, ptep, 1) 147 147 148 - #endif /* !__ASSEMBLY__ */ 148 + #endif /* !__ASSEMBLER__ */ 149 149 150 150 /* MMU-specific headers */ 151 151 ··· 157 157 #include <asm/motorola_pgtable.h> 158 158 #endif 159 159 160 - #ifndef __ASSEMBLY__ 160 + #ifndef __ASSEMBLER__ 161 161 /* 162 162 * Macro to mark a page protection value as "uncacheable". 163 163 */ ··· 182 182 #define pgprot_dmacoherent(prot) pgprot_dmacoherent(prot) 183 183 184 184 #endif /* CONFIG_COLDFIRE */ 185 - #endif /* !__ASSEMBLY__ */ 185 + #endif /* !__ASSEMBLER__ */ 186 186 187 187 #endif /* _M68K_PGTABLE_H */

+2 -2

arch/m68k/include/asm/ptrace.h

··· 4 4 5 5 #include <uapi/asm/ptrace.h> 6 6 7 - #ifndef __ASSEMBLY__ 7 + #ifndef __ASSEMBLER__ 8 8 9 9 #ifndef PS_S 10 10 #define PS_S (0x2000) ··· 24 24 #define arch_has_block_step() (1) 25 25 #endif 26 26 27 - #endif /* __ASSEMBLY__ */ 27 + #endif /* __ASSEMBLER__ */ 28 28 #endif /* _M68K_PTRACE_H */

+5 -5

arch/m68k/include/asm/setup.h

··· 28 28 29 29 #define CL_SIZE COMMAND_LINE_SIZE 30 30 31 - #ifndef __ASSEMBLY__ 31 + #ifndef __ASSEMBLER__ 32 32 extern unsigned long m68k_machtype; 33 - #endif /* !__ASSEMBLY__ */ 33 + #endif /* !__ASSEMBLER__ */ 34 34 35 35 #if !defined(CONFIG_AMIGA) 36 36 # define MACH_IS_AMIGA (0) ··· 199 199 #endif 200 200 201 201 202 - #ifndef __ASSEMBLY__ 202 + #ifndef __ASSEMBLER__ 203 203 extern unsigned long m68k_cputype; 204 204 extern unsigned long m68k_fputype; 205 205 extern unsigned long m68k_mmutype; ··· 213 213 */ 214 214 215 215 extern int m68k_is040or060; 216 - #endif /* !__ASSEMBLY__ */ 216 + #endif /* !__ASSEMBLER__ */ 217 217 218 218 #if !defined(CONFIG_M68020) 219 219 # define CPU_IS_020 (0) ··· 321 321 322 322 #define NUM_MEMINFO 4 323 323 324 - #ifndef __ASSEMBLY__ 324 + #ifndef __ASSEMBLER__ 325 325 struct m68k_mem_info { 326 326 unsigned long addr; /* physical address of memory chunk */ 327 327 unsigned long size; /* length of memory chunk (in bytes) */

+4 -4

arch/m68k/include/asm/sun3_pgtable.h

··· 4 4 5 5 #include <asm/sun3mmu.h> 6 6 7 - #ifndef __ASSEMBLY__ 7 + #ifndef __ASSEMBLER__ 8 8 #include <asm/virtconvert.h> 9 9 #include <linux/linkage.h> 10 10 ··· 19 19 #define PTOV(addr) __va(addr) 20 20 21 21 22 - #endif /* !__ASSEMBLY__ */ 22 + #endif /* !__ASSEMBLER__ */ 23 23 24 24 /* These need to be defined for compatibility although the sun3 doesn't use them */ 25 25 #define _PAGE_NOCACHE030 0x040 ··· 74 74 /* We borrow bit 6 to store the exclusive marker in swap PTEs. */ 75 75 #define _PAGE_SWP_EXCLUSIVE 0x040 76 76 77 - #ifndef __ASSEMBLY__ 77 + #ifndef __ASSEMBLER__ 78 78 79 79 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 80 80 { ··· 186 186 return pte; 187 187 } 188 188 189 - #endif /* !__ASSEMBLY__ */ 189 + #endif /* !__ASSEMBLER__ */ 190 190 #endif /* !_SUN3_PGTABLE_H */

+2 -2

arch/m68k/include/asm/sun3mmu.h

··· 67 67 #define SUN3_BUSERR_PROTERR (0x40) 68 68 #define SUN3_BUSERR_INVALID (0x80) 69 69 70 - #ifndef __ASSEMBLY__ 70 + #ifndef __ASSEMBLER__ 71 71 72 72 /* Read bus error status register (implicitly clearing it). */ 73 73 static inline unsigned char sun3_get_buserr(void) ··· 167 167 168 168 extern int sun3_map_test(unsigned long addr, char *val); 169 169 170 - #endif /* !__ASSEMBLY__ */ 170 + #endif /* !__ASSEMBLER__ */ 171 171 172 172 #endif /* !__SUN3_MMU_H__ */

+3 -3

arch/m68k/include/asm/thread_info.h

··· 22 22 23 23 #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER) 24 24 25 - #ifndef __ASSEMBLY__ 25 + #ifndef __ASSEMBLER__ 26 26 27 27 struct thread_info { 28 28 struct task_struct *task; /* main task structure */ ··· 31 31 __u32 cpu; /* should always be 0 on m68k */ 32 32 unsigned long tp_value; /* thread pointer */ 33 33 }; 34 - #endif /* __ASSEMBLY__ */ 34 + #endif /* __ASSEMBLER__ */ 35 35 36 36 #define INIT_THREAD_INFO(tsk) \ 37 37 { \ ··· 39 39 .preempt_count = INIT_PREEMPT_COUNT, \ 40 40 } 41 41 42 - #ifndef __ASSEMBLY__ 42 + #ifndef __ASSEMBLER__ 43 43 /* how to get the thread information struct from C */ 44 44 static inline struct thread_info *current_thread_info(void) 45 45 {

+3 -3

arch/m68k/include/asm/traps.h

··· 11 11 #ifndef _M68K_TRAPS_H 12 12 #define _M68K_TRAPS_H 13 13 14 - #ifndef __ASSEMBLY__ 14 + #ifndef __ASSEMBLER__ 15 15 16 16 #include <linux/linkage.h> 17 17 #include <asm/ptrace.h> ··· 94 94 95 95 #define VECOFF(vec) ((vec)<<2) 96 96 97 - #ifndef __ASSEMBLY__ 97 + #ifndef __ASSEMBLER__ 98 98 99 99 /* Status register bits */ 100 100 #define PS_T (0x8000) ··· 271 271 asmlinkage void berr_040cleanup(struct frame *fp); 272 272 #endif 273 273 274 - #endif /* __ASSEMBLY__ */ 274 + #endif /* __ASSEMBLER__ */ 275 275 276 276 #endif /* _M68K_TRAPS_H */

+2 -2

arch/m68k/include/uapi/asm/bootinfo-vme.h

··· 33 33 #define VME_TYPE_BVME6000 0x6000 /* BVM Ltd. BVME6000 */ 34 34 35 35 36 - #ifndef __ASSEMBLY__ 36 + #ifndef __ASSEMBLER__ 37 37 38 38 /* 39 39 * Board ID data structure - pointer to this retrieved from Bug by head.S ··· 56 56 __be32 option2; 57 57 } t_bdid, *p_bdid; 58 58 59 - #endif /* __ASSEMBLY__ */ 59 + #endif /* __ASSEMBLER__ */ 60 60 61 61 62 62 /*

+4 -4

arch/m68k/include/uapi/asm/bootinfo.h

··· 16 16 #include <linux/types.h> 17 17 18 18 19 - #ifndef __ASSEMBLY__ 19 + #ifndef __ASSEMBLER__ 20 20 21 21 /* 22 22 * Bootinfo definitions ··· 43 43 __be32 size; /* length of memory chunk (in bytes) */ 44 44 }; 45 45 46 - #endif /* __ASSEMBLY__ */ 46 + #endif /* __ASSEMBLER__ */ 47 47 48 48 49 49 /* ··· 167 167 #define BI_VERSION_MAJOR(v) (((v) >> 16) & 0xffff) 168 168 #define BI_VERSION_MINOR(v) ((v) & 0xffff) 169 169 170 - #ifndef __ASSEMBLY__ 170 + #ifndef __ASSEMBLER__ 171 171 172 172 struct bootversion { 173 173 __be16 branch; ··· 178 178 } machversions[]; 179 179 } __packed; 180 180 181 - #endif /* __ASSEMBLY__ */ 181 + #endif /* __ASSEMBLER__ */ 182 182 183 183 184 184 #endif /* _UAPI_ASM_M68K_BOOTINFO_H */

+2 -2

arch/m68k/include/uapi/asm/ptrace.h

··· 22 22 #define PT_SR 17 23 23 #define PT_PC 18 24 24 25 - #ifndef __ASSEMBLY__ 25 + #ifndef __ASSEMBLER__ 26 26 27 27 /* this struct defines the way the registers are stored on the 28 28 stack during a system call. */ ··· 81 81 #define PTRACE_GETFDPIC_EXEC 0 82 82 #define PTRACE_GETFDPIC_INTERP 1 83 83 84 - #endif /* __ASSEMBLY__ */ 84 + #endif /* __ASSEMBLER__ */ 85 85 #endif /* _UAPI_M68K_PTRACE_H */

+14 -28

arch/m68k/kernel/early_printk.c

··· 16 16 #include "../mvme147/mvme147.h" 17 17 #include "../mvme16x/mvme16x.h" 18 18 19 - asmlinkage void __init debug_cons_nputs(const char *s, unsigned n); 20 - 21 - static void __ref debug_cons_write(struct console *c, 22 - const char *s, unsigned n) 23 - { 24 - #if !(defined(CONFIG_SUN3) || defined(CONFIG_M68000) || \ 25 - defined(CONFIG_COLDFIRE)) 26 - if (MACH_IS_MVME147) 27 - mvme147_scc_write(c, s, n); 28 - else if (MACH_IS_MVME16x) 29 - mvme16x_cons_write(c, s, n); 30 - else 31 - debug_cons_nputs(s, n); 32 - #endif 33 - } 19 + asmlinkage void __init debug_cons_nputs(struct console *c, const char *s, unsigned int n); 34 20 35 21 static struct console early_console_instance = { 36 22 .name = "debug", 37 - .write = debug_cons_write, 38 23 .flags = CON_PRINTBUFFER | CON_BOOT, 39 24 .index = -1 40 25 }; ··· 29 44 if (early_console || buf) 30 45 return 0; 31 46 47 + if (MACH_IS_MVME147) 48 + early_console_instance.write = mvme147_scc_write; 49 + else if (MACH_IS_MVME16x) 50 + early_console_instance.write = mvme16x_cons_write; 51 + else 52 + early_console_instance.write = debug_cons_nputs; 32 53 early_console = &early_console_instance; 33 54 register_console(early_console); 34 55 ··· 42 51 } 43 52 early_param("earlyprintk", setup_early_printk); 44 53 45 - /* 46 - * debug_cons_nputs() defined in arch/m68k/kernel/head.S cannot be called 47 - * after init sections are discarded (for platforms that use it). 48 - */ 49 - #if !(defined(CONFIG_SUN3) || defined(CONFIG_M68000) || \ 50 - defined(CONFIG_COLDFIRE)) 51 - 52 54 static int __init unregister_early_console(void) 53 55 { 54 - if (!early_console || MACH_IS_MVME16x) 55 - return 0; 56 + /* 57 + * debug_cons_nputs() defined in arch/m68k/kernel/head.S cannot be 58 + * called after init sections are discarded (for platforms that use it). 59 + */ 60 + if (early_console && early_console->write == debug_cons_nputs) 61 + return unregister_console(early_console); 56 62 57 - return unregister_console(early_console); 63 + return 0; 58 64 } 59 65 late_initcall(unregister_early_console); 60 - 61 - #endif

+42 -41

arch/m68k/kernel/head.S

··· 3263 3263 * turns around and calls the internal routines. This routine 3264 3264 * is used by the boot console. 3265 3265 * 3266 - * The calling parameters are: 3267 - * void debug_cons_nputs(const char *str, unsigned length) 3266 + * The function signature is - 3267 + * void debug_cons_nputs(struct console *c, const char *s, unsigned int n) 3268 3268 * 3269 3269 * This routine does NOT understand variable arguments only 3270 3270 * simple strings! ··· 3273 3273 moveml %d0/%d1/%a0,%sp@- 3274 3274 movew %sr,%sp@- 3275 3275 ori #0x0700,%sr 3276 - movel %sp@(18),%a0 /* fetch parameter */ 3277 - movel %sp@(22),%d1 /* fetch parameter */ 3276 + movel %sp@(22),%a0 /* char *s */ 3277 + movel %sp@(26),%d1 /* unsigned int n */ 3278 3278 jra 2f 3279 3279 1: 3280 3280 #ifdef CONSOLE_DEBUG ··· 3400 3400 3401 3401 movel %d4,%d1 /* screen height in pixels */ 3402 3402 divul %a0@(FONT_DESC_HEIGHT),%d1 /* d1 = max num rows */ 3403 + subql #1,%d1 /* row range is 0 to num - 1 */ 3403 3404 3404 3405 movel %d0,%a2@(Lconsole_struct_num_columns) 3405 3406 movel %d1,%a2@(Lconsole_struct_num_rows) ··· 3533 3532 tstl %pc@(L(console_font)) 3534 3533 jeq L(console_exit) 3535 3534 3535 + lea %pc@(L(console_globals)),%a0 3536 + 3536 3537 /* Output character in d7 on console. 3537 3538 */ 3538 3539 movel ARG1,%d7 3539 3540 cmpib #'\n',%d7 3540 - jbne 1f 3541 - 3542 - /* A little safe recursion is good for the soul */ 3543 - console_putc #'\r' 3544 - 1: 3545 - lea %pc@(L(console_globals)),%a0 3546 - 3547 - cmpib #10,%d7 3548 3541 jne L(console_not_lf) 3542 + 3543 + clrl %a0@(Lconsole_struct_cur_column) /* implicit \r */ 3544 + 3549 3545 movel %a0@(Lconsole_struct_cur_row),%d0 3550 - addil #1,%d0 3551 - movel %d0,%a0@(Lconsole_struct_cur_row) 3552 3546 movel %a0@(Lconsole_struct_num_rows),%d1 3553 3547 cmpl %d1,%d0 3554 3548 jcs 1f 3555 - subil #1,%d0 3556 - movel %d0,%a0@(Lconsole_struct_cur_row) 3557 3549 console_scroll 3550 + jra L(console_exit) 3558 3551 1: 3552 + addql #1,%d0 3553 + movel %d0,%a0@(Lconsole_struct_cur_row) 3559 3554 jra L(console_exit) 3560 3555 3561 3556 L(console_not_lf): 3562 - cmpib #13,%d7 3563 - jne L(console_not_cr) 3557 + cmpib #'\r',%d7 3558 + jne L(console_not_lf_not_cr) 3564 3559 clrl %a0@(Lconsole_struct_cur_column) 3565 3560 jra L(console_exit) 3566 3561 3567 - L(console_not_cr): 3568 - cmpib #1,%d7 3569 - jne L(console_not_home) 3570 - clrl %a0@(Lconsole_struct_cur_row) 3571 - clrl %a0@(Lconsole_struct_cur_column) 3572 - jra L(console_exit) 3573 - 3574 - /* 3575 - * At this point we know that the %d7 character is going to be 3576 - * rendered on the screen. Register usage is - 3577 - * a0 = pointer to console globals 3578 - * a1 = font data 3579 - * d0 = cursor column 3580 - * d1 = cursor row to draw the character 3581 - * d7 = character number 3582 - */ 3583 - L(console_not_home): 3562 + /* 3563 + * At this point we know that the %d7 character is going to be 3564 + * rendered on the screen. Register usage is - 3565 + * a0 = pointer to console globals 3566 + * a1 = font data 3567 + * d0 = cursor column 3568 + * d1 = cursor row to draw the character 3569 + * d7 = character number 3570 + */ 3571 + L(console_not_lf_not_cr): 3584 3572 movel %a0@(Lconsole_struct_cur_column),%d0 3585 - addql #1,%a0@(Lconsole_struct_cur_column) 3586 - movel %a0@(Lconsole_struct_num_columns),%d1 3587 - cmpl %d1,%d0 3588 - jcs 1f 3589 - console_putc #'\n' /* recursion is OK! */ 3590 - 1: 3591 3573 movel %a0@(Lconsole_struct_cur_row),%d1 3592 3574 3593 3575 /* ··· 3616 3632 subl %a0@(FONT_DESC_WIDTH),%d0 3617 3633 addq #1,%d1 3618 3634 dbra %d7,L(console_read_char_scanline) 3635 + 3636 + /* 3637 + * Register usage in the code below: 3638 + * a0 = pointer to console globals 3639 + * d0 = cursor column 3640 + * d1 = cursor column limit 3641 + */ 3642 + 3643 + lea %pc@(L(console_globals)),%a0 3644 + 3645 + movel %a0@(Lconsole_struct_cur_column),%d0 3646 + addql #1,%d0 3647 + movel %d0,%a0@(Lconsole_struct_cur_column) /* Update cursor pos */ 3648 + movel %a0@(Lconsole_struct_num_columns),%d1 3649 + cmpl %d1,%d0 3650 + jcs L(console_exit) 3651 + console_putc #'\n' /* Line wrap using tail recursion */ 3619 3652 3620 3653 L(console_exit): 3621 3654 func_return console_putc

+16

arch/m68k/mac/via.c

··· 621 621 * These problems are avoided by ignoring the low byte. Clock accuracy 622 622 * is 256 times worse (error can reach 0.327 ms) but CPU overhead is 623 623 * reduced by avoiding slow VIA register accesses. 624 + * 625 + * The VIA timer counter observably decrements to 0xFFFF before the 626 + * counter reload interrupt gets raised. That complicates things a bit. 627 + * 628 + * State | vT1CH | VIA_TIMER_1_INT | inference drawn 629 + * ------+------------+-----------------+----------------------------- 630 + * i | FE thru 00 | false | counter is decrementing 631 + * ii | FF | false | counter wrapped 632 + * iii | FF | true | wrapped, interrupt raised 633 + * iv | FF | false | wrapped, interrupt handled 634 + * v | FE thru 00 | true | wrapped, interrupt unhandled 635 + * 636 + * State iv is never observed because handling the interrupt involves 637 + * a 6522 register access and every access consumes a "phi 2" clock 638 + * cycle. So 0xFF implies either state ii or state iii, depending on 639 + * the value of the VIA_TIMER_1_INT bit. 624 640 */ 625 641 626 642 local_irq_save(flags);

+4 -4

arch/m68k/math-emu/fp_emu.h

··· 38 38 #ifndef _FP_EMU_H 39 39 #define _FP_EMU_H 40 40 41 - #ifdef __ASSEMBLY__ 41 + #ifdef __ASSEMBLER__ 42 42 #include <asm/asm-offsets.h> 43 43 #endif 44 44 #include <asm/math-emu.h> 45 45 46 - #ifndef __ASSEMBLY__ 46 + #ifndef __ASSEMBLER__ 47 47 48 48 #define IS_INF(a) ((a)->exp == 0x7fff) 49 49 #define IS_ZERO(a) ((a)->mant.m64 == 0) ··· 124 124 : "a1", "d1", "d2", "memory"); \ 125 125 }) 126 126 127 - #else /* __ASSEMBLY__ */ 127 + #else /* __ASSEMBLER__ */ 128 128 129 129 /* 130 130 * set, reset or clear a bit in the fp status register ··· 141 141 btst #(\bit&7),(FPD_FPSR+3-(\bit/8),FPDATA) 142 142 .endm 143 143 144 - #endif /* __ASSEMBLY__ */ 144 + #endif /* __ASSEMBLER__ */ 145 145 146 146 #endif /* _FP_EMU_H */

+29 -27

arch/m68k/mm/motorola.c

··· 92 92 } 93 93 94 94 /* ++andreas: {get,free}_pointer_table rewritten to use unused fields from 95 - struct page instead of separately kmalloced struct. Stolen from 95 + struct ptdesc instead of separately kmalloced struct. Stolen from 96 96 arch/sparc/mm/srmmu.c ... */ 97 97 98 98 typedef struct list_head ptable_desc; ··· 103 103 LIST_HEAD_INIT(ptable_list[2]), 104 104 }; 105 105 106 - #define PD_PTABLE(page) ((ptable_desc *)&(virt_to_page((void *)(page))->lru)) 107 - #define PD_PAGE(ptable) (list_entry(ptable, struct page, lru)) 106 + #define PD_PTABLE(ptdesc) ((ptable_desc *)&(virt_to_ptdesc((void *)(ptdesc))->pt_list)) 108 107 #define PD_PTDESC(ptable) (list_entry(ptable, struct ptdesc, pt_list)) 109 108 #define PD_MARKBITS(dp) (*(unsigned int *)&PD_PTDESC(dp)->pt_index) 110 109 ··· 120 121 { 121 122 ptable_desc *dp; 122 123 unsigned long ptable = (unsigned long)table; 123 - unsigned long page = ptable & PAGE_MASK; 124 - unsigned int mask = 1U << ((ptable - page)/ptable_size(type)); 124 + unsigned long pt_addr = ptable & PAGE_MASK; 125 + unsigned int mask = 1U << ((ptable - pt_addr)/ptable_size(type)); 125 126 126 - dp = PD_PTABLE(page); 127 + dp = PD_PTABLE(pt_addr); 127 128 if (!(PD_MARKBITS(dp) & mask)) { 128 129 PD_MARKBITS(dp) = ptable_mask(type); 129 130 list_add(dp, &ptable_list[type]); ··· 132 133 PD_MARKBITS(dp) &= ~mask; 133 134 pr_debug("init_pointer_table: %lx, %x\n", ptable, PD_MARKBITS(dp)); 134 135 135 - /* unreserve the page so it's possible to free that page */ 136 - __ClearPageReserved(PD_PAGE(dp)); 137 - init_page_count(PD_PAGE(dp)); 136 + /* unreserve the ptdesc so it's possible to free that ptdesc */ 137 + __ClearPageReserved(ptdesc_page(PD_PTDESC(dp))); 138 + init_page_count(ptdesc_page(PD_PTDESC(dp))); 138 139 139 140 return; 140 141 } ··· 147 148 148 149 /* 149 150 * For a pointer table for a user process address space, a 150 - * table is taken from a page allocated for the purpose. Each 151 - * page can hold 8 pointer tables. The page is remapped in 151 + * table is taken from a ptdesc allocated for the purpose. Each 152 + * ptdesc can hold 8 pointer tables. The ptdesc is remapped in 152 153 * virtual address space to be noncacheable. 153 154 */ 154 155 if (mask == 0) { 155 - void *page; 156 + struct ptdesc *ptdesc; 156 157 ptable_desc *new; 158 + void *pt_addr; 157 159 158 - if (!(page = (void *)get_zeroed_page(GFP_KERNEL))) 160 + ptdesc = pagetable_alloc(GFP_KERNEL | __GFP_ZERO, 0); 161 + if (!ptdesc) 159 162 return NULL; 163 + 164 + pt_addr = ptdesc_address(ptdesc); 160 165 161 166 switch (type) { 162 167 case TABLE_PTE: ··· 168 165 * m68k doesn't have SPLIT_PTE_PTLOCKS for not having 169 166 * SMP. 170 167 */ 171 - pagetable_pte_ctor(mm, virt_to_ptdesc(page)); 168 + pagetable_pte_ctor(mm, ptdesc); 172 169 break; 173 170 case TABLE_PMD: 174 - pagetable_pmd_ctor(mm, virt_to_ptdesc(page)); 171 + pagetable_pmd_ctor(mm, ptdesc); 175 172 break; 176 173 case TABLE_PGD: 177 - pagetable_pgd_ctor(virt_to_ptdesc(page)); 174 + pagetable_pgd_ctor(ptdesc); 178 175 break; 179 176 } 180 177 181 - mmu_page_ctor(page); 178 + mmu_page_ctor(pt_addr); 182 179 183 - new = PD_PTABLE(page); 180 + new = PD_PTABLE(pt_addr); 184 181 PD_MARKBITS(new) = ptable_mask(type) - 1; 185 182 list_add_tail(new, dp); 186 183 187 - return (pmd_t *)page; 184 + return (pmd_t *)pt_addr; 188 185 } 189 186 190 187 for (tmp = 1, off = 0; (mask & tmp) == 0; tmp <<= 1, off += ptable_size(type)) ··· 194 191 /* move to end of list */ 195 192 list_move_tail(dp, &ptable_list[type]); 196 193 } 197 - return page_address(PD_PAGE(dp)) + off; 194 + return ptdesc_address(PD_PTDESC(dp)) + off; 198 195 } 199 196 200 197 int free_pointer_table(void *table, int type) 201 198 { 202 199 ptable_desc *dp; 203 200 unsigned long ptable = (unsigned long)table; 204 - unsigned long page = ptable & PAGE_MASK; 205 - unsigned int mask = 1U << ((ptable - page)/ptable_size(type)); 201 + unsigned long pt_addr = ptable & PAGE_MASK; 202 + unsigned int mask = 1U << ((ptable - pt_addr)/ptable_size(type)); 206 203 207 - dp = PD_PTABLE(page); 204 + dp = PD_PTABLE(pt_addr); 208 205 if (PD_MARKBITS (dp) & mask) 209 206 panic ("table already free!"); 210 207 211 208 PD_MARKBITS (dp) |= mask; 212 209 213 210 if (PD_MARKBITS(dp) == ptable_mask(type)) { 214 - /* all tables in page are free, free page */ 211 + /* all tables in ptdesc are free, free ptdesc */ 215 212 list_del(dp); 216 - mmu_page_dtor((void *)page); 217 - pagetable_dtor(virt_to_ptdesc((void *)page)); 218 - free_page (page); 213 + mmu_page_dtor((void *)pt_addr); 214 + pagetable_dtor_free(virt_to_ptdesc((void *)pt_addr)); 219 215 return 1; 220 216 } else if (ptable_list[type].next != dp) { 221 217 /*