Skip to content

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

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

Pull m68k updates from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Provide __phys_to_pfn() and __pfn_to_phys()
  m68k/atari, m68k/sun3: Fix SCSI platform device registration when driver is modular
  m68k/defconfig: Update defconfigs for v4.4-rc1
  m68k/mac: Kill psc_present
parents c5c80bd9 eb37bc3f
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 11 deletions
arch/m68k/atari/config.c
View file @ 2945e9f1
...@@ -858,7 +858,7 @@ static struct platform_device *atari_netusbee_devices[] __initdata = { ...@@ -858,7 +858,7 @@ static struct platform_device *atari_netusbee_devices[] __initdata = {
}; };
#endif /* CONFIG_ATARI_ETHERNEC */ #endif /* CONFIG_ATARI_ETHERNEC */
#ifdef CONFIG_ATARI_SCSI #if IS_ENABLED(CONFIG_ATARI_SCSI)
static const struct resource atari_scsi_st_rsrc[] __initconst = { static const struct resource atari_scsi_st_rsrc[] __initconst = {
{ {
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
...@@ -910,7 +910,7 @@ int __init atari_platform_init(void) ...@@ -910,7 +910,7 @@ int __init atari_platform_init(void)
} }
#endif #endif
#ifdef CONFIG_ATARI_SCSI #if IS_ENABLED(CONFIG_ATARI_SCSI)
if (ATARIHW_PRESENT(ST_SCSI)) if (ATARIHW_PRESENT(ST_SCSI))
platform_device_register_simple("atari_scsi", -1, platform_device_register_simple("atari_scsi", -1,
atari_scsi_st_rsrc, ARRAY_SIZE(atari_scsi_st_rsrc)); atari_scsi_st_rsrc, ARRAY_SIZE(atari_scsi_st_rsrc));
......
arch/m68k/configs/amiga_defconfig
View file @ 2945e9f1
...@@ -276,6 +276,7 @@ CONFIG_MPLS=y ...@@ -276,6 +276,7 @@ CONFIG_MPLS=y
CONFIG_NET_MPLS_GSO=m CONFIG_NET_MPLS_GSO=m
CONFIG_MPLS_ROUTING=m CONFIG_MPLS_ROUTING=m
CONFIG_MPLS_IPTUNNEL=m CONFIG_MPLS_IPTUNNEL=m
CONFIG_NET_L3_MASTER_DEV=y
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
# CONFIG_UEVENT_HELPER is not set # CONFIG_UEVENT_HELPER is not set
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
...@@ -532,11 +533,13 @@ CONFIG_NLS_MAC_INUIT=m ...@@ -532,11 +533,13 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_LKM=m CONFIG_TEST_LKM=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -559,6 +562,7 @@ CONFIG_CRYPTO_CTS=m ...@@ -559,6 +562,7 @@ CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
......
arch/m68k/configs/apollo_defconfig
View file @ 2945e9f1
...@@ -274,6 +274,7 @@ CONFIG_MPLS=y ...@@ -274,6 +274,7 @@ CONFIG_MPLS=y
CONFIG_NET_MPLS_GSO=m CONFIG_NET_MPLS_GSO=m
CONFIG_MPLS_ROUTING=m CONFIG_MPLS_ROUTING=m
CONFIG_MPLS_IPTUNNEL=m CONFIG_MPLS_IPTUNNEL=m
CONFIG_NET_L3_MASTER_DEV=y
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
# CONFIG_UEVENT_HELPER is not set # CONFIG_UEVENT_HELPER is not set
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
...@@ -372,6 +373,7 @@ CONFIG_INPUT_EVDEV=m ...@@ -372,6 +373,7 @@ CONFIG_INPUT_EVDEV=m
# CONFIG_MOUSE_PS2 is not set # CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_SERIAL=m
CONFIG_SERIO=m CONFIG_SERIO=m
CONFIG_USERIO=m
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
# CONFIG_HW_RANDOM is not set # CONFIG_HW_RANDOM is not set
...@@ -490,11 +492,13 @@ CONFIG_NLS_MAC_INUIT=m ...@@ -490,11 +492,13 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_LKM=m CONFIG_TEST_LKM=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -517,6 +521,7 @@ CONFIG_CRYPTO_CTS=m ...@@ -517,6 +521,7 @@ CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
......
arch/m68k/configs/atari_defconfig
View file @ 2945e9f1
...@@ -274,6 +274,7 @@ CONFIG_MPLS=y ...@@ -274,6 +274,7 @@ CONFIG_MPLS=y
CONFIG_NET_MPLS_GSO=m CONFIG_NET_MPLS_GSO=m
CONFIG_MPLS_ROUTING=m CONFIG_MPLS_ROUTING=m
CONFIG_MPLS_IPTUNNEL=m CONFIG_MPLS_IPTUNNEL=m
CONFIG_NET_L3_MASTER_DEV=y
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
# CONFIG_UEVENT_HELPER is not set # CONFIG_UEVENT_HELPER is not set
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
...@@ -512,11 +513,13 @@ CONFIG_NLS_MAC_INUIT=m ...@@ -512,11 +513,13 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_LKM=m CONFIG_TEST_LKM=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -539,6 +542,7 @@ CONFIG_CRYPTO_CTS=m ...@@ -539,6 +542,7 @@ CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
......
arch/m68k/configs/bvme6000_defconfig
View file @ 2945e9f1
...@@ -272,6 +272,7 @@ CONFIG_MPLS=y ...@@ -272,6 +272,7 @@ CONFIG_MPLS=y
CONFIG_NET_MPLS_GSO=m CONFIG_NET_MPLS_GSO=m
CONFIG_MPLS_ROUTING=m CONFIG_MPLS_ROUTING=m
CONFIG_MPLS_IPTUNNEL=m CONFIG_MPLS_IPTUNNEL=m
CONFIG_NET_L3_MASTER_DEV=y
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
# CONFIG_UEVENT_HELPER is not set # CONFIG_UEVENT_HELPER is not set
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
...@@ -483,11 +484,13 @@ CONFIG_NLS_MAC_INUIT=m ...@@ -483,11 +484,13 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_LKM=m CONFIG_TEST_LKM=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -510,6 +513,7 @@ CONFIG_CRYPTO_CTS=m ...@@ -510,6 +513,7 @@ CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
......
arch/m68k/configs/hp300_defconfig
View file @ 2945e9f1
...@@ -274,6 +274,7 @@ CONFIG_MPLS=y ...@@ -274,6 +274,7 @@ CONFIG_MPLS=y
CONFIG_NET_MPLS_GSO=m CONFIG_NET_MPLS_GSO=m
CONFIG_MPLS_ROUTING=m CONFIG_MPLS_ROUTING=m
CONFIG_MPLS_IPTUNNEL=m CONFIG_MPLS_IPTUNNEL=m
CONFIG_NET_L3_MASTER_DEV=y
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
# CONFIG_UEVENT_HELPER is not set # CONFIG_UEVENT_HELPER is not set
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
...@@ -375,6 +376,7 @@ CONFIG_MOUSE_SERIAL=m ...@@ -375,6 +376,7 @@ CONFIG_MOUSE_SERIAL=m
CONFIG_INPUT_MISC=y CONFIG_INPUT_MISC=y
CONFIG_HP_SDC_RTC=m CONFIG_HP_SDC_RTC=m
CONFIG_SERIO_SERPORT=m CONFIG_SERIO_SERPORT=m
CONFIG_USERIO=m
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
# CONFIG_HW_RANDOM is not set # CONFIG_HW_RANDOM is not set
...@@ -492,11 +494,13 @@ CONFIG_NLS_MAC_INUIT=m ...@@ -492,11 +494,13 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_LKM=m CONFIG_TEST_LKM=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -519,6 +523,7 @@ CONFIG_CRYPTO_CTS=m ...@@ -519,6 +523,7 @@ CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
......
arch/m68k/configs/mac_defconfig
View file @ 2945e9f1
...@@ -276,6 +276,7 @@ CONFIG_MPLS=y ...@@ -276,6 +276,7 @@ CONFIG_MPLS=y
CONFIG_NET_MPLS_GSO=m CONFIG_NET_MPLS_GSO=m
CONFIG_MPLS_ROUTING=m CONFIG_MPLS_ROUTING=m
CONFIG_MPLS_IPTUNNEL=m CONFIG_MPLS_IPTUNNEL=m
CONFIG_NET_L3_MASTER_DEV=y
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
# CONFIG_UEVENT_HELPER is not set # CONFIG_UEVENT_HELPER is not set
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
...@@ -394,6 +395,7 @@ CONFIG_MOUSE_SERIAL=m ...@@ -394,6 +395,7 @@ CONFIG_MOUSE_SERIAL=m
CONFIG_INPUT_MISC=y CONFIG_INPUT_MISC=y
CONFIG_INPUT_M68K_BEEP=m CONFIG_INPUT_M68K_BEEP=m
CONFIG_SERIO=m CONFIG_SERIO=m
CONFIG_USERIO=m
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
CONFIG_SERIAL_PMACZILOG=y CONFIG_SERIAL_PMACZILOG=y
...@@ -514,11 +516,13 @@ CONFIG_NLS_MAC_INUIT=m ...@@ -514,11 +516,13 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_LKM=m CONFIG_TEST_LKM=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -541,6 +545,7 @@ CONFIG_CRYPTO_CTS=m ...@@ -541,6 +545,7 @@ CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
......
arch/m68k/configs/multi_defconfig
View file @ 2945e9f1
...@@ -286,6 +286,7 @@ CONFIG_MPLS=y ...@@ -286,6 +286,7 @@ CONFIG_MPLS=y
CONFIG_NET_MPLS_GSO=m CONFIG_NET_MPLS_GSO=m
CONFIG_MPLS_ROUTING=m CONFIG_MPLS_ROUTING=m
CONFIG_MPLS_IPTUNNEL=m CONFIG_MPLS_IPTUNNEL=m
CONFIG_NET_L3_MASTER_DEV=y
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
# CONFIG_UEVENT_HELPER is not set # CONFIG_UEVENT_HELPER is not set
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
...@@ -449,6 +450,7 @@ CONFIG_INPUT_MISC=y ...@@ -449,6 +450,7 @@ CONFIG_INPUT_MISC=y
CONFIG_INPUT_M68K_BEEP=m CONFIG_INPUT_M68K_BEEP=m
CONFIG_HP_SDC_RTC=m CONFIG_HP_SDC_RTC=m
CONFIG_SERIO_Q40KBD=y CONFIG_SERIO_Q40KBD=y
CONFIG_USERIO=m
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
CONFIG_SERIAL_PMACZILOG=y CONFIG_SERIAL_PMACZILOG=y
...@@ -594,11 +596,13 @@ CONFIG_NLS_MAC_INUIT=m ...@@ -594,11 +596,13 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_LKM=m CONFIG_TEST_LKM=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -621,6 +625,7 @@ CONFIG_CRYPTO_CTS=m ...@@ -621,6 +625,7 @@ CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
......
arch/m68k/configs/mvme147_defconfig
View file @ 2945e9f1
...@@ -271,6 +271,7 @@ CONFIG_MPLS=y ...@@ -271,6 +271,7 @@ CONFIG_MPLS=y
CONFIG_NET_MPLS_GSO=m CONFIG_NET_MPLS_GSO=m
CONFIG_MPLS_ROUTING=m CONFIG_MPLS_ROUTING=m
CONFIG_MPLS_IPTUNNEL=m CONFIG_MPLS_IPTUNNEL=m
CONFIG_NET_L3_MASTER_DEV=y
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
# CONFIG_UEVENT_HELPER is not set # CONFIG_UEVENT_HELPER is not set
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
...@@ -483,11 +484,13 @@ CONFIG_NLS_MAC_INUIT=m ...@@ -483,11 +484,13 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_LKM=m CONFIG_TEST_LKM=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -510,6 +513,7 @@ CONFIG_CRYPTO_CTS=m ...@@ -510,6 +513,7 @@ CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
......
arch/m68k/configs/mvme16x_defconfig
View file @ 2945e9f1
...@@ -272,6 +272,7 @@ CONFIG_MPLS=y ...@@ -272,6 +272,7 @@ CONFIG_MPLS=y
CONFIG_NET_MPLS_GSO=m CONFIG_NET_MPLS_GSO=m
CONFIG_MPLS_ROUTING=m CONFIG_MPLS_ROUTING=m
CONFIG_MPLS_IPTUNNEL=m CONFIG_MPLS_IPTUNNEL=m
CONFIG_NET_L3_MASTER_DEV=y
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
# CONFIG_UEVENT_HELPER is not set # CONFIG_UEVENT_HELPER is not set
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
...@@ -483,11 +484,13 @@ CONFIG_NLS_MAC_INUIT=m ...@@ -483,11 +484,13 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_LKM=m CONFIG_TEST_LKM=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -510,6 +513,7 @@ CONFIG_CRYPTO_CTS=m ...@@ -510,6 +513,7 @@ CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
......
arch/m68k/configs/q40_defconfig
View file @ 2945e9f1
...@@ -272,6 +272,7 @@ CONFIG_MPLS=y ...@@ -272,6 +272,7 @@ CONFIG_MPLS=y
CONFIG_NET_MPLS_GSO=m CONFIG_NET_MPLS_GSO=m
CONFIG_MPLS_ROUTING=m CONFIG_MPLS_ROUTING=m
CONFIG_MPLS_IPTUNNEL=m CONFIG_MPLS_IPTUNNEL=m
CONFIG_NET_L3_MASTER_DEV=y
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
# CONFIG_UEVENT_HELPER is not set # CONFIG_UEVENT_HELPER is not set
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
...@@ -385,6 +386,7 @@ CONFIG_MOUSE_SERIAL=m ...@@ -385,6 +386,7 @@ CONFIG_MOUSE_SERIAL=m
CONFIG_INPUT_MISC=y CONFIG_INPUT_MISC=y
CONFIG_INPUT_M68K_BEEP=m CONFIG_INPUT_M68K_BEEP=m
CONFIG_SERIO_Q40KBD=y CONFIG_SERIO_Q40KBD=y
CONFIG_USERIO=m
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
CONFIG_PRINTER=m CONFIG_PRINTER=m
...@@ -505,11 +507,13 @@ CONFIG_NLS_MAC_INUIT=m ...@@ -505,11 +507,13 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_LKM=m CONFIG_TEST_LKM=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -532,6 +536,7 @@ CONFIG_CRYPTO_CTS=m ...@@ -532,6 +536,7 @@ CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
......
arch/m68k/configs/sun3_defconfig
View file @ 2945e9f1
...@@ -269,6 +269,7 @@ CONFIG_MPLS=y ...@@ -269,6 +269,7 @@ CONFIG_MPLS=y
CONFIG_NET_MPLS_GSO=m CONFIG_NET_MPLS_GSO=m
CONFIG_MPLS_ROUTING=m CONFIG_MPLS_ROUTING=m
CONFIG_MPLS_IPTUNNEL=m CONFIG_MPLS_IPTUNNEL=m
CONFIG_NET_L3_MASTER_DEV=y
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
# CONFIG_UEVENT_HELPER is not set # CONFIG_UEVENT_HELPER is not set
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
...@@ -369,6 +370,7 @@ CONFIG_INPUT_EVDEV=m ...@@ -369,6 +370,7 @@ CONFIG_INPUT_EVDEV=m
CONFIG_KEYBOARD_SUNKBD=y CONFIG_KEYBOARD_SUNKBD=y
# CONFIG_MOUSE_PS2 is not set # CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_SERIAL=m
CONFIG_USERIO=m
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
# CONFIG_HW_RANDOM is not set # CONFIG_HW_RANDOM is not set
...@@ -484,11 +486,13 @@ CONFIG_NLS_MAC_INUIT=m ...@@ -484,11 +486,13 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_LKM=m CONFIG_TEST_LKM=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -510,6 +514,7 @@ CONFIG_CRYPTO_CTS=m ...@@ -510,6 +514,7 @@ CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
......
arch/m68k/configs/sun3x_defconfig
View file @ 2945e9f1
...@@ -269,6 +269,7 @@ CONFIG_MPLS=y ...@@ -269,6 +269,7 @@ CONFIG_MPLS=y
CONFIG_NET_MPLS_GSO=m CONFIG_NET_MPLS_GSO=m
CONFIG_MPLS_ROUTING=m CONFIG_MPLS_ROUTING=m
CONFIG_MPLS_IPTUNNEL=m CONFIG_MPLS_IPTUNNEL=m
CONFIG_NET_L3_MASTER_DEV=y
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
# CONFIG_UEVENT_HELPER is not set # CONFIG_UEVENT_HELPER is not set
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
...@@ -369,6 +370,7 @@ CONFIG_INPUT_EVDEV=m ...@@ -369,6 +370,7 @@ CONFIG_INPUT_EVDEV=m
CONFIG_KEYBOARD_SUNKBD=y CONFIG_KEYBOARD_SUNKBD=y
# CONFIG_MOUSE_PS2 is not set # CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_SERIAL=m
CONFIG_USERIO=m
# CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
# CONFIG_HW_RANDOM is not set # CONFIG_HW_RANDOM is not set
...@@ -484,11 +486,13 @@ CONFIG_NLS_MAC_INUIT=m ...@@ -484,11 +486,13 @@ CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_LKM=m CONFIG_TEST_LKM=m
CONFIG_TEST_USER_COPY=m CONFIG_TEST_USER_COPY=m
...@@ -511,6 +515,7 @@ CONFIG_CRYPTO_CTS=m ...@@ -511,6 +515,7 @@ CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_KEYWRAP=m
CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
......
arch/m68k/include/asm/mac_psc.h
View file @ 2945e9f1
...@@ -209,7 +209,6 @@ ...@@ -209,7 +209,6 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
extern volatile __u8 *psc; extern volatile __u8 *psc;
extern int psc_present;
extern void psc_register_interrupts(void); extern void psc_register_interrupts(void);
extern void psc_irq_enable(int); extern void psc_irq_enable(int);
......
arch/m68k/include/asm/page.h
View file @ 2945e9f1
...@@ -48,6 +48,9 @@ extern unsigned long _ramend; ...@@ -48,6 +48,9 @@ extern unsigned long _ramend;
#include <asm/page_no.h> #include <asm/page_no.h>
#endif #endif
#define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT))
#define __pfn_to_phys(pfn) PFN_PHYS(pfn)
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
......
arch/m68k/mac/macints.c
View file @ 2945e9f1
...@@ -174,7 +174,7 @@ void __init mac_init_IRQ(void) ...@@ -174,7 +174,7 @@ void __init mac_init_IRQ(void)
oss_register_interrupts(); oss_register_interrupts();
else else
via_register_interrupts(); via_register_interrupts();
if (psc_present) if (psc)
psc_register_interrupts(); psc_register_interrupts();
if (baboon_present) if (baboon_present)
baboon_register_interrupts(); baboon_register_interrupts();
...@@ -212,7 +212,7 @@ void mac_irq_enable(struct irq_data *data) ...@@ -212,7 +212,7 @@ void mac_irq_enable(struct irq_data *data)
case 4: case 4:
case 5: case 5:
case 6: case 6:
if (psc_present) if (psc)
psc_irq_enable(irq); psc_irq_enable(irq);
else if (oss_present) else if (oss_present)
oss_irq_enable(irq); oss_irq_enable(irq);
...@@ -242,7 +242,7 @@ void mac_irq_disable(struct irq_data *data) ...@@ -242,7 +242,7 @@ void mac_irq_disable(struct irq_data *data)
case 4: case 4:
case 5: case 5:
case 6: case 6:
if (psc_present) if (psc)
psc_irq_disable(irq); psc_irq_disable(irq);
else if (oss_present) else if (oss_present)
oss_irq_disable(irq); oss_irq_disable(irq);
......
arch/m68k/mac/psc.c
View file @ 2945e9f1
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#define DEBUG_PSC #define DEBUG_PSC
int psc_present;
volatile __u8 *psc; volatile __u8 *psc;
EXPORT_SYMBOL_GPL(psc); EXPORT_SYMBOL_GPL(psc);
...@@ -39,7 +38,9 @@ static void psc_debug_dump(void) ...@@ -39,7 +38,9 @@ static void psc_debug_dump(void)
{ {
int i; int i;
if (!psc_present) return; if (!psc)
return;
for (i = 0x30 ; i < 0x70 ; i += 0x10) { for (i = 0x30 ; i < 0x70 ; i += 0x10) {
printk("PSC #%d: IFR = 0x%02X IER = 0x%02X\n", printk("PSC #%d: IFR = 0x%02X IER = 0x%02X\n",
i >> 4, i >> 4,
...@@ -81,7 +82,6 @@ void __init psc_init(void) ...@@ -81,7 +82,6 @@ void __init psc_init(void)
&& macintosh_config->ident != MAC_MODEL_Q840) && macintosh_config->ident != MAC_MODEL_Q840)
{ {
psc = NULL; psc = NULL;
psc_present = 0;
return; return;
} }
...@@ -91,7 +91,6 @@ void __init psc_init(void) ...@@ -91,7 +91,6 @@ void __init psc_init(void)
*/ */
psc = (void *) PSC_BASE; psc = (void *) PSC_BASE;
psc_present = 1;
printk("PSC detected at %p\n", psc); printk("PSC detected at %p\n", psc);
......
arch/m68k/sun3/config.c
View file @ 2945e9f1
...@@ -171,7 +171,7 @@ static void __init sun3_sched_init(irq_handler_t timer_routine) ...@@ -171,7 +171,7 @@ static void __init sun3_sched_init(irq_handler_t timer_routine)
intersil_clear(); intersil_clear();
} }
#ifdef CONFIG_SUN3_SCSI #if IS_ENABLED(CONFIG_SUN3_SCSI)
static const struct resource sun3_scsi_vme_rsrc[] __initconst = { static const struct resource sun3_scsi_vme_rsrc[] __initconst = {
{ {
......
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