Skip to content

L
linux
Commit adc5ea22 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

Pull m68k updates from Geert Uytterhoeven:

 - miscellaneous fixes

 - defconfig updates

* tag 'm68k-for-v5.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Fix asm register constraints for atomic ops
  m68k: Fix invalid RMW_INSNS on CPUs that lack CAS
  m68k: defconfig: Update defconfigs for v5.14-rc1
  m68k: emu: Fix invalid free in nfeth_cleanup()
parents 44a7d444 87d93029
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 22 deletions
arch/m68k/Kconfig.cpu
View file @ adc5ea22
...@@ -26,6 +26,7 @@ config COLDFIRE ...@@ -26,6 +26,7 @@ config COLDFIRE
bool "Coldfire CPU family support" bool "Coldfire CPU family support"
select ARCH_HAVE_CUSTOM_GPIO_H select ARCH_HAVE_CUSTOM_GPIO_H
select CPU_HAS_NO_BITFIELDS select CPU_HAS_NO_BITFIELDS
select CPU_HAS_NO_CAS
select CPU_HAS_NO_MULDIV64 select CPU_HAS_NO_MULDIV64
select GENERIC_CSUM select GENERIC_CSUM
select GPIOLIB select GPIOLIB
...@@ -39,6 +40,7 @@ config M68000 ...@@ -39,6 +40,7 @@ config M68000
bool bool
depends on !MMU depends on !MMU
select CPU_HAS_NO_BITFIELDS select CPU_HAS_NO_BITFIELDS
select CPU_HAS_NO_CAS
select CPU_HAS_NO_MULDIV64 select CPU_HAS_NO_MULDIV64
select CPU_HAS_NO_UNALIGNED select CPU_HAS_NO_UNALIGNED
select GENERIC_CSUM select GENERIC_CSUM
...@@ -54,6 +56,7 @@ config M68000 ...@@ -54,6 +56,7 @@ config M68000
config MCPU32 config MCPU32
bool bool
select CPU_HAS_NO_BITFIELDS select CPU_HAS_NO_BITFIELDS
select CPU_HAS_NO_CAS
select CPU_HAS_NO_UNALIGNED select CPU_HAS_NO_UNALIGNED
select CPU_NO_EFFICIENT_FFS select CPU_NO_EFFICIENT_FFS
help help
...@@ -383,7 +386,7 @@ config ADVANCED ...@@ -383,7 +386,7 @@ config ADVANCED
config RMW_INSNS config RMW_INSNS
bool "Use read-modify-write instructions" bool "Use read-modify-write instructions"
depends on ADVANCED depends on ADVANCED && !CPU_HAS_NO_CAS
help help
This allows to use certain instructions that work with indivisible This allows to use certain instructions that work with indivisible
read-modify-write bus cycles. While this is faster than the read-modify-write bus cycles. While this is faster than the
...@@ -450,6 +453,9 @@ config M68K_L2_CACHE ...@@ -450,6 +453,9 @@ config M68K_L2_CACHE
config CPU_HAS_NO_BITFIELDS config CPU_HAS_NO_BITFIELDS
bool bool
config CPU_HAS_NO_CAS
bool
config CPU_HAS_NO_MULDIV64 config CPU_HAS_NO_MULDIV64
bool bool
......
arch/m68k/configs/amiga_defconfig
View file @ adc5ea22
...@@ -84,6 +84,7 @@ CONFIG_IPV6_ILA=m ...@@ -84,6 +84,7 @@ CONFIG_IPV6_ILA=m
CONFIG_IPV6_VTI=m CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NETFILTER_NETLINK_HOOK=m
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_ZONES=y
# CONFIG_NF_CONNTRACK_PROCFS is not set # CONFIG_NF_CONNTRACK_PROCFS is not set
...@@ -323,7 +324,6 @@ CONFIG_CDROM_PKTCDVD=m ...@@ -323,7 +324,6 @@ CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m CONFIG_DUMMY_IRQ=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
...@@ -502,6 +502,7 @@ CONFIG_ROOT_NFS=y ...@@ -502,6 +502,7 @@ CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
CONFIG_NFSD_V3=y CONFIG_NFSD_V3=y
CONFIG_CIFS=m CONFIG_CIFS=m
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DEBUG is not set
CONFIG_CODA_FS=m CONFIG_CODA_FS=m
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
...@@ -616,6 +617,7 @@ CONFIG_PRIME_NUMBERS=m ...@@ -616,6 +617,7 @@ CONFIG_PRIME_NUMBERS=m
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
...@@ -624,7 +626,6 @@ CONFIG_WW_MUTEX_SELFTEST=m ...@@ -624,7 +626,6 @@ CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_KUNIT=m CONFIG_KUNIT=m
CONFIG_KUNIT_ALL_TESTS=m CONFIG_KUNIT_ALL_TESTS=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_TEST_DIV64=m CONFIG_TEST_DIV64=m
...@@ -636,6 +637,7 @@ CONFIG_TEST_STRING_HELPERS=m ...@@ -636,6 +637,7 @@ CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
......
arch/m68k/configs/apollo_defconfig
View file @ adc5ea22
...@@ -80,6 +80,7 @@ CONFIG_IPV6_ILA=m ...@@ -80,6 +80,7 @@ CONFIG_IPV6_ILA=m
CONFIG_IPV6_VTI=m CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NETFILTER_NETLINK_HOOK=m
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_ZONES=y
# CONFIG_NF_CONNTRACK_PROCFS is not set # CONFIG_NF_CONNTRACK_PROCFS is not set
...@@ -458,6 +459,7 @@ CONFIG_ROOT_NFS=y ...@@ -458,6 +459,7 @@ CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
CONFIG_NFSD_V3=y CONFIG_NFSD_V3=y
CONFIG_CIFS=m CONFIG_CIFS=m
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DEBUG is not set
CONFIG_CODA_FS=m CONFIG_CODA_FS=m
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
...@@ -580,7 +582,6 @@ CONFIG_WW_MUTEX_SELFTEST=m ...@@ -580,7 +582,6 @@ CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_KUNIT=m CONFIG_KUNIT=m
CONFIG_KUNIT_ALL_TESTS=m CONFIG_KUNIT_ALL_TESTS=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_TEST_DIV64=m CONFIG_TEST_DIV64=m
...@@ -592,6 +593,7 @@ CONFIG_TEST_STRING_HELPERS=m ...@@ -592,6 +593,7 @@ CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
......
arch/m68k/configs/atari_defconfig
View file @ adc5ea22
...@@ -87,6 +87,7 @@ CONFIG_IPV6_ILA=m ...@@ -87,6 +87,7 @@ CONFIG_IPV6_ILA=m
CONFIG_IPV6_VTI=m CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NETFILTER_NETLINK_HOOK=m
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_ZONES=y
# CONFIG_NF_CONNTRACK_PROCFS is not set # CONFIG_NF_CONNTRACK_PROCFS is not set
...@@ -324,7 +325,6 @@ CONFIG_CDROM_PKTCDVD=m ...@@ -324,7 +325,6 @@ CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m CONFIG_DUMMY_IRQ=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
...@@ -480,6 +480,7 @@ CONFIG_ROOT_NFS=y ...@@ -480,6 +480,7 @@ CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
CONFIG_NFSD_V3=y CONFIG_NFSD_V3=y
CONFIG_CIFS=m CONFIG_CIFS=m
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DEBUG is not set
CONFIG_CODA_FS=m CONFIG_CODA_FS=m
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
...@@ -594,6 +595,7 @@ CONFIG_PRIME_NUMBERS=m ...@@ -594,6 +595,7 @@ CONFIG_PRIME_NUMBERS=m
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
...@@ -602,7 +604,6 @@ CONFIG_WW_MUTEX_SELFTEST=m ...@@ -602,7 +604,6 @@ CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_KUNIT=m CONFIG_KUNIT=m
CONFIG_KUNIT_ALL_TESTS=m CONFIG_KUNIT_ALL_TESTS=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_TEST_DIV64=m CONFIG_TEST_DIV64=m
...@@ -614,6 +615,7 @@ CONFIG_TEST_STRING_HELPERS=m ...@@ -614,6 +615,7 @@ CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
......
arch/m68k/configs/bvme6000_defconfig
View file @ adc5ea22
...@@ -77,6 +77,7 @@ CONFIG_IPV6_ILA=m ...@@ -77,6 +77,7 @@ CONFIG_IPV6_ILA=m
CONFIG_IPV6_VTI=m CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NETFILTER_NETLINK_HOOK=m
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_ZONES=y
# CONFIG_NF_CONNTRACK_PROCFS is not set # CONFIG_NF_CONNTRACK_PROCFS is not set
...@@ -451,6 +452,7 @@ CONFIG_ROOT_NFS=y ...@@ -451,6 +452,7 @@ CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
CONFIG_NFSD_V3=y CONFIG_NFSD_V3=y
CONFIG_CIFS=m CONFIG_CIFS=m
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DEBUG is not set
CONFIG_CODA_FS=m CONFIG_CODA_FS=m
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
...@@ -573,7 +575,6 @@ CONFIG_WW_MUTEX_SELFTEST=m ...@@ -573,7 +575,6 @@ CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_KUNIT=m CONFIG_KUNIT=m
CONFIG_KUNIT_ALL_TESTS=m CONFIG_KUNIT_ALL_TESTS=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_TEST_DIV64=m CONFIG_TEST_DIV64=m
...@@ -585,6 +586,7 @@ CONFIG_TEST_STRING_HELPERS=m ...@@ -585,6 +586,7 @@ CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
......
arch/m68k/configs/hp300_defconfig
View file @ adc5ea22
...@@ -79,6 +79,7 @@ CONFIG_IPV6_ILA=m ...@@ -79,6 +79,7 @@ CONFIG_IPV6_ILA=m
CONFIG_IPV6_VTI=m CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NETFILTER_NETLINK_HOOK=m
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_ZONES=y
# CONFIG_NF_CONNTRACK_PROCFS is not set # CONFIG_NF_CONNTRACK_PROCFS is not set
...@@ -460,6 +461,7 @@ CONFIG_ROOT_NFS=y ...@@ -460,6 +461,7 @@ CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
CONFIG_NFSD_V3=y CONFIG_NFSD_V3=y
CONFIG_CIFS=m CONFIG_CIFS=m
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DEBUG is not set
CONFIG_CODA_FS=m CONFIG_CODA_FS=m
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
...@@ -582,7 +584,6 @@ CONFIG_WW_MUTEX_SELFTEST=m ...@@ -582,7 +584,6 @@ CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_KUNIT=m CONFIG_KUNIT=m
CONFIG_KUNIT_ALL_TESTS=m CONFIG_KUNIT_ALL_TESTS=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_TEST_DIV64=m CONFIG_TEST_DIV64=m
...@@ -594,6 +595,7 @@ CONFIG_TEST_STRING_HELPERS=m ...@@ -594,6 +595,7 @@ CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
......
arch/m68k/configs/mac_defconfig
View file @ adc5ea22
...@@ -78,6 +78,7 @@ CONFIG_IPV6_ILA=m ...@@ -78,6 +78,7 @@ CONFIG_IPV6_ILA=m
CONFIG_IPV6_VTI=m CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NETFILTER_NETLINK_HOOK=m
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_ZONES=y
# CONFIG_NF_CONNTRACK_PROCFS is not set # CONFIG_NF_CONNTRACK_PROCFS is not set
...@@ -315,7 +316,6 @@ CONFIG_CDROM_PKTCDVD=m ...@@ -315,7 +316,6 @@ CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m CONFIG_DUMMY_IRQ=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
...@@ -482,6 +482,7 @@ CONFIG_ROOT_NFS=y ...@@ -482,6 +482,7 @@ CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
CONFIG_NFSD_V3=y CONFIG_NFSD_V3=y
CONFIG_CIFS=m CONFIG_CIFS=m
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DEBUG is not set
CONFIG_CODA_FS=m CONFIG_CODA_FS=m
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
...@@ -596,6 +597,7 @@ CONFIG_PRIME_NUMBERS=m ...@@ -596,6 +597,7 @@ CONFIG_PRIME_NUMBERS=m
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
...@@ -604,7 +606,6 @@ CONFIG_WW_MUTEX_SELFTEST=m ...@@ -604,7 +606,6 @@ CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_KUNIT=m CONFIG_KUNIT=m
CONFIG_KUNIT_ALL_TESTS=m CONFIG_KUNIT_ALL_TESTS=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_TEST_DIV64=m CONFIG_TEST_DIV64=m
...@@ -616,6 +617,7 @@ CONFIG_TEST_STRING_HELPERS=m ...@@ -616,6 +617,7 @@ CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
......
arch/m68k/configs/multi_defconfig
View file @ adc5ea22
...@@ -98,6 +98,7 @@ CONFIG_IPV6_ILA=m ...@@ -98,6 +98,7 @@ CONFIG_IPV6_ILA=m
CONFIG_IPV6_VTI=m CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NETFILTER_NETLINK_HOOK=m
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_ZONES=y
# CONFIG_NF_CONNTRACK_PROCFS is not set # CONFIG_NF_CONNTRACK_PROCFS is not set
...@@ -344,7 +345,6 @@ CONFIG_CDROM_PKTCDVD=m ...@@ -344,7 +345,6 @@ CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m CONFIG_DUMMY_IRQ=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
...@@ -567,6 +567,7 @@ CONFIG_ROOT_NFS=y ...@@ -567,6 +567,7 @@ CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
CONFIG_NFSD_V3=y CONFIG_NFSD_V3=y
CONFIG_CIFS=m CONFIG_CIFS=m
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DEBUG is not set
CONFIG_CODA_FS=m CONFIG_CODA_FS=m
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
...@@ -681,6 +682,7 @@ CONFIG_PRIME_NUMBERS=m ...@@ -681,6 +682,7 @@ CONFIG_PRIME_NUMBERS=m
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
...@@ -689,7 +691,6 @@ CONFIG_WW_MUTEX_SELFTEST=m ...@@ -689,7 +691,6 @@ CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_KUNIT=m CONFIG_KUNIT=m
CONFIG_KUNIT_ALL_TESTS=m CONFIG_KUNIT_ALL_TESTS=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_TEST_DIV64=m CONFIG_TEST_DIV64=m
...@@ -701,6 +702,7 @@ CONFIG_TEST_STRING_HELPERS=m ...@@ -701,6 +702,7 @@ CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
......
arch/m68k/configs/mvme147_defconfig
View file @ adc5ea22
...@@ -76,6 +76,7 @@ CONFIG_IPV6_ILA=m ...@@ -76,6 +76,7 @@ CONFIG_IPV6_ILA=m
CONFIG_IPV6_VTI=m CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NETFILTER_NETLINK_HOOK=m
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_ZONES=y
# CONFIG_NF_CONNTRACK_PROCFS is not set # CONFIG_NF_CONNTRACK_PROCFS is not set
...@@ -450,6 +451,7 @@ CONFIG_ROOT_NFS=y ...@@ -450,6 +451,7 @@ CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
CONFIG_NFSD_V3=y CONFIG_NFSD_V3=y
CONFIG_CIFS=m CONFIG_CIFS=m
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DEBUG is not set
CONFIG_CODA_FS=m CONFIG_CODA_FS=m
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
...@@ -572,7 +574,6 @@ CONFIG_WW_MUTEX_SELFTEST=m ...@@ -572,7 +574,6 @@ CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_KUNIT=m CONFIG_KUNIT=m
CONFIG_KUNIT_ALL_TESTS=m CONFIG_KUNIT_ALL_TESTS=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_TEST_DIV64=m CONFIG_TEST_DIV64=m
...@@ -584,6 +585,7 @@ CONFIG_TEST_STRING_HELPERS=m ...@@ -584,6 +585,7 @@ CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
......
arch/m68k/configs/mvme16x_defconfig
View file @ adc5ea22
...@@ -77,6 +77,7 @@ CONFIG_IPV6_ILA=m ...@@ -77,6 +77,7 @@ CONFIG_IPV6_ILA=m
CONFIG_IPV6_VTI=m CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NETFILTER_NETLINK_HOOK=m
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_ZONES=y
# CONFIG_NF_CONNTRACK_PROCFS is not set # CONFIG_NF_CONNTRACK_PROCFS is not set
...@@ -451,6 +452,7 @@ CONFIG_ROOT_NFS=y ...@@ -451,6 +452,7 @@ CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
CONFIG_NFSD_V3=y CONFIG_NFSD_V3=y
CONFIG_CIFS=m CONFIG_CIFS=m
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DEBUG is not set
CONFIG_CODA_FS=m CONFIG_CODA_FS=m
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
...@@ -573,7 +575,6 @@ CONFIG_WW_MUTEX_SELFTEST=m ...@@ -573,7 +575,6 @@ CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_KUNIT=m CONFIG_KUNIT=m
CONFIG_KUNIT_ALL_TESTS=m CONFIG_KUNIT_ALL_TESTS=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_TEST_DIV64=m CONFIG_TEST_DIV64=m
...@@ -585,6 +586,7 @@ CONFIG_TEST_STRING_HELPERS=m ...@@ -585,6 +586,7 @@ CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
......
arch/m68k/configs/q40_defconfig
View file @ adc5ea22
...@@ -78,6 +78,7 @@ CONFIG_IPV6_ILA=m ...@@ -78,6 +78,7 @@ CONFIG_IPV6_ILA=m
CONFIG_IPV6_VTI=m CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NETFILTER_NETLINK_HOOK=m
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_ZONES=y
# CONFIG_NF_CONNTRACK_PROCFS is not set # CONFIG_NF_CONNTRACK_PROCFS is not set
...@@ -314,7 +315,6 @@ CONFIG_CDROM_PKTCDVD=m ...@@ -314,7 +315,6 @@ CONFIG_CDROM_PKTCDVD=m
CONFIG_ATA_OVER_ETH=m CONFIG_ATA_OVER_ETH=m
CONFIG_DUMMY_IRQ=m CONFIG_DUMMY_IRQ=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR=y
...@@ -469,6 +469,7 @@ CONFIG_ROOT_NFS=y ...@@ -469,6 +469,7 @@ CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
CONFIG_NFSD_V3=y CONFIG_NFSD_V3=y
CONFIG_CIFS=m CONFIG_CIFS=m
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DEBUG is not set
CONFIG_CODA_FS=m CONFIG_CODA_FS=m
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
...@@ -583,6 +584,7 @@ CONFIG_PRIME_NUMBERS=m ...@@ -583,6 +584,7 @@ CONFIG_PRIME_NUMBERS=m
CONFIG_CRC32_SELFTEST=m CONFIG_CRC32_SELFTEST=m
CONFIG_CRC64=m CONFIG_CRC64=m
CONFIG_XZ_DEC_TEST=m CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
...@@ -591,7 +593,6 @@ CONFIG_WW_MUTEX_SELFTEST=m ...@@ -591,7 +593,6 @@ CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_KUNIT=m CONFIG_KUNIT=m
CONFIG_KUNIT_ALL_TESTS=m CONFIG_KUNIT_ALL_TESTS=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_TEST_DIV64=m CONFIG_TEST_DIV64=m
...@@ -603,6 +604,7 @@ CONFIG_TEST_STRING_HELPERS=m ...@@ -603,6 +604,7 @@ CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
......
arch/m68k/configs/sun3_defconfig
View file @ adc5ea22
...@@ -74,6 +74,7 @@ CONFIG_IPV6_ILA=m ...@@ -74,6 +74,7 @@ CONFIG_IPV6_ILA=m
CONFIG_IPV6_VTI=m CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NETFILTER_NETLINK_HOOK=m
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_ZONES=y
# CONFIG_NF_CONNTRACK_PROCFS is not set # CONFIG_NF_CONNTRACK_PROCFS is not set
...@@ -453,6 +454,7 @@ CONFIG_ROOT_NFS=y ...@@ -453,6 +454,7 @@ CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
CONFIG_NFSD_V3=y CONFIG_NFSD_V3=y
CONFIG_CIFS=m CONFIG_CIFS=m
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DEBUG is not set
CONFIG_CODA_FS=m CONFIG_CODA_FS=m
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
...@@ -574,7 +576,6 @@ CONFIG_TEST_LOCKUP=m ...@@ -574,7 +576,6 @@ CONFIG_TEST_LOCKUP=m
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_KUNIT=m CONFIG_KUNIT=m
CONFIG_KUNIT_ALL_TESTS=m CONFIG_KUNIT_ALL_TESTS=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_TEST_DIV64=m CONFIG_TEST_DIV64=m
...@@ -586,6 +587,7 @@ CONFIG_TEST_STRING_HELPERS=m ...@@ -586,6 +587,7 @@ CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
......
arch/m68k/configs/sun3x_defconfig
View file @ adc5ea22
...@@ -74,6 +74,7 @@ CONFIG_IPV6_ILA=m ...@@ -74,6 +74,7 @@ CONFIG_IPV6_ILA=m
CONFIG_IPV6_VTI=m CONFIG_IPV6_VTI=m
CONFIG_IPV6_GRE=m CONFIG_IPV6_GRE=m
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NETFILTER_NETLINK_HOOK=m
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_ZONES=y
# CONFIG_NF_CONNTRACK_PROCFS is not set # CONFIG_NF_CONNTRACK_PROCFS is not set
...@@ -452,6 +453,7 @@ CONFIG_ROOT_NFS=y ...@@ -452,6 +453,7 @@ CONFIG_ROOT_NFS=y
CONFIG_NFSD=m CONFIG_NFSD=m
CONFIG_NFSD_V3=y CONFIG_NFSD_V3=y
CONFIG_CIFS=m CONFIG_CIFS=m
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DEBUG is not set
CONFIG_CODA_FS=m CONFIG_CODA_FS=m
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
...@@ -574,7 +576,6 @@ CONFIG_WW_MUTEX_SELFTEST=m ...@@ -574,7 +576,6 @@ CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_KUNIT=m CONFIG_KUNIT=m
CONFIG_KUNIT_ALL_TESTS=m CONFIG_KUNIT_ALL_TESTS=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_TEST_DIV64=m CONFIG_TEST_DIV64=m
...@@ -586,6 +587,7 @@ CONFIG_TEST_STRING_HELPERS=m ...@@ -586,6 +587,7 @@ CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m
CONFIG_TEST_BITMAP=m CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
......
arch/m68k/emu/nfeth.c
View file @ adc5ea22
...@@ -254,8 +254,8 @@ static void __exit nfeth_cleanup(void) ...@@ -254,8 +254,8 @@ static void __exit nfeth_cleanup(void)
for (i = 0; i < MAX_UNIT; i++) { for (i = 0; i < MAX_UNIT; i++) {
if (nfeth_dev[i]) { if (nfeth_dev[i]) {
unregister_netdev(nfeth_dev[0]); unregister_netdev(nfeth_dev[i]);
free_netdev(nfeth_dev[0]); free_netdev(nfeth_dev[i]);
} }
} }
free_irq(nfEtherIRQ, nfeth_interrupt); free_irq(nfEtherIRQ, nfeth_interrupt);
......
arch/m68k/include/asm/atomic.h
View file @ adc5ea22
...@@ -48,7 +48,7 @@ static inline int arch_atomic_##op##_return(int i, atomic_t *v) \ ...@@ -48,7 +48,7 @@ static inline int arch_atomic_##op##_return(int i, atomic_t *v) \
" casl %2,%1,%0\n" \ " casl %2,%1,%0\n" \
" jne 1b" \ " jne 1b" \
: "+m" (*v), "=&d" (t), "=&d" (tmp) \ : "+m" (*v), "=&d" (t), "=&d" (tmp) \
: "g" (i), "2" (arch_atomic_read(v))); \ : "di" (i), "2" (arch_atomic_read(v))); \
return t; \ return t; \
} }
...@@ -63,7 +63,7 @@ static inline int arch_atomic_fetch_##op(int i, atomic_t *v) \ ...@@ -63,7 +63,7 @@ static inline int arch_atomic_fetch_##op(int i, atomic_t *v) \
" casl %2,%1,%0\n" \ " casl %2,%1,%0\n" \
" jne 1b" \ " jne 1b" \
: "+m" (*v), "=&d" (t), "=&d" (tmp) \ : "+m" (*v), "=&d" (t), "=&d" (tmp) \
: "g" (i), "2" (arch_atomic_read(v))); \ : "di" (i), "2" (arch_atomic_read(v))); \
return tmp; \ return tmp; \
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7