Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

Pull m68k updates from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Update defconfigs for v3.14-rc1
  [SCSI] atari_scsi: Fix sleep_on race
  m68k: head.S - Remove bogus L prefix in comment
  m68k: Remove dead code
  m68k: Remove CONSOLE_PENGUIN macro, adopt CONFIG_LOGO
Linus Torvalds 11 years ago
parent
1f8c538ed6 50be9eba83
commit
f24279172d
14 changed files with 88 additions and 114 deletions
Split View Show Diff Stats
  1. 6 4
      arch/m68k/configs/amiga_defconfig
  2. 6 4
      arch/m68k/configs/apollo_defconfig
  3. 6 4
      arch/m68k/configs/atari_defconfig
  4. 6 4
      arch/m68k/configs/bvme6000_defconfig
  5. 6 4
      arch/m68k/configs/hp300_defconfig
  6. 6 4
      arch/m68k/configs/mac_defconfig
  7. 6 4
      arch/m68k/configs/multi_defconfig
  8. 6 4
      arch/m68k/configs/mvme147_defconfig
  9. 6 4
      arch/m68k/configs/mvme16x_defconfig
  10. 6 4
      arch/m68k/configs/q40_defconfig
  11. 6 4
      arch/m68k/configs/sun3_defconfig
  12. 6 4
      arch/m68k/configs/sun3x_defconfig
  13. 7 63
      arch/m68k/kernel/head.S
  14. 9 3
      drivers/scsi/atari_scsi.c

+ 6 - 4
arch/m68k/configs/amiga_defconfig
View File 

@@ -24,6 +24,8 @@ CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_SYSV68_PARTITION=y
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68020=y
 
 CONFIG_M68030=y
 
 CONFIG_M68040=y
 
@@ -85,6 +87,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -94,6 +97,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -126,6 +131,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -163,8 +169,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -190,7 +194,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -512,7 +515,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/apollo_defconfig
View File 

@@ -25,6 +25,8 @@ CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_SYSV68_PARTITION=y
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68020=y
 
 CONFIG_M68030=y
 
 CONFIG_M68040=y
 
@@ -83,6 +85,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -92,6 +95,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -124,6 +129,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -161,8 +167,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -188,7 +192,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -470,7 +473,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/atari_defconfig
View File 

@@ -24,6 +24,8 @@ CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_SYSV68_PARTITION=y
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68020=y
 
 CONFIG_M68030=y
 
 CONFIG_M68040=y
 
@@ -82,6 +84,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -91,6 +94,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -123,6 +128,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -160,8 +166,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -187,7 +191,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -487,7 +490,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/bvme6000_defconfig
View File 

@@ -24,6 +24,8 @@ CONFIG_UNIXWARE_DISKLABEL=y
 
 CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68040=y
 
 CONFIG_M68060=y
 
 CONFIG_VME=y
 
@@ -81,6 +83,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -90,6 +93,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -122,6 +127,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -159,8 +165,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -186,7 +190,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -463,7 +466,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/hp300_defconfig
View File 

@@ -25,6 +25,8 @@ CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_SYSV68_PARTITION=y
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68020=y
 
 CONFIG_M68030=y
 
 CONFIG_M68040=y
 
@@ -83,6 +85,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -92,6 +95,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -124,6 +129,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -161,8 +167,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -188,7 +192,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -472,7 +475,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/mac_defconfig
View File 

@@ -24,6 +24,8 @@ CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_SYSV68_PARTITION=y
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68020=y
 
 CONFIG_M68030=y
 
 CONFIG_M68040=y
 
@@ -82,6 +84,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -91,6 +94,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -123,6 +128,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -160,8 +166,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -187,7 +191,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -495,7 +498,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/multi_defconfig
View File 

@@ -20,6 +20,8 @@ CONFIG_SOLARIS_X86_PARTITION=y
 
 CONFIG_UNIXWARE_DISKLABEL=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68020=y
 
 CONFIG_M68040=y
 
 CONFIG_M68060=y
 
@@ -91,6 +93,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -100,6 +103,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -132,6 +137,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -169,8 +175,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -196,7 +200,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -571,7 +574,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/mvme147_defconfig
View File 

@@ -24,6 +24,8 @@ CONFIG_UNIXWARE_DISKLABEL=y
 
 CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68030=y
 
 CONFIG_VME=y
 
 CONFIG_MVME147=y
 
@@ -80,6 +82,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -89,6 +92,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -121,6 +126,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -158,8 +164,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -185,7 +189,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -463,7 +466,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/mvme16x_defconfig
View File 

@@ -24,6 +24,8 @@ CONFIG_UNIXWARE_DISKLABEL=y
 
 CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68040=y
 
 CONFIG_M68060=y
 
 CONFIG_VME=y
 
@@ -81,6 +83,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -90,6 +93,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -122,6 +127,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -159,8 +165,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -186,7 +190,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -464,7 +467,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/q40_defconfig
View File 

@@ -25,6 +25,8 @@ CONFIG_SUN_PARTITION=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_SYSV68_PARTITION=y
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_M68040=y
 
 CONFIG_M68060=y
 
 CONFIG_Q40=y
 
@@ -81,6 +83,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -90,6 +93,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -122,6 +127,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -159,8 +165,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -186,7 +190,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -485,7 +488,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/sun3_defconfig
View File 

@@ -24,6 +24,8 @@ CONFIG_UNIXWARE_DISKLABEL=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_SYSV68_PARTITION=y
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_SUN3=y
 
 # CONFIG_COMPACTION is not set
 
 CONFIG_CLEANCACHE=y
 
@@ -78,6 +80,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -87,6 +90,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -119,6 +124,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -156,8 +162,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -183,7 +187,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -464,7 +467,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 6 - 4
arch/m68k/configs/sun3x_defconfig
View File 

@@ -24,6 +24,8 @@ CONFIG_UNIXWARE_DISKLABEL=y
 
 # CONFIG_EFI_PARTITION is not set
 
 CONFIG_SYSV68_PARTITION=y
 
 CONFIG_IOSCHED_DEADLINE=m
 
+CONFIG_KEXEC=y
 
+CONFIG_BOOTINFO_PROC=y
 
 CONFIG_SUN3X=y
 
 # CONFIG_COMPACTION is not set
 
 CONFIG_CLEANCACHE=y
 
@@ -78,6 +80,7 @@ CONFIG_NF_CONNTRACK_SANE=m
 
 CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
+CONFIG_NF_TABLES_INET=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -87,6 +90,8 @@ CONFIG_NFT_COUNTER=m
 
 CONFIG_NFT_LOG=m
 
 CONFIG_NFT_LIMIT=m
 
 CONFIG_NFT_NAT=m
 
+CONFIG_NFT_QUEUE=m
 
+CONFIG_NFT_REJECT=m
 
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NETFILTER_XT_SET=m
 
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 
@@ -119,6 +124,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 
@@ -156,8 +162,6 @@ CONFIG_IP_SET_HASH_NETPORT=m
 
 CONFIG_IP_SET_HASH_NETIFACE=m
 
 CONFIG_IP_SET_LIST_SET=m
 
 CONFIG_NF_CONNTRACK_IPV4=m
 
-CONFIG_NF_TABLES_IPV4=m
 
-CONFIG_NFT_REJECT_IPV4=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 
 CONFIG_NF_TABLES_ARP=m
 
@@ -183,7 +187,6 @@ CONFIG_IP_NF_ARPTABLES=m
 
 CONFIG_IP_NF_ARPFILTER=m
 
 CONFIG_IP_NF_ARP_MANGLE=m
 
 CONFIG_NF_CONNTRACK_IPV6=m
 
-CONFIG_NF_TABLES_IPV6=m
 
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 
 CONFIG_NFT_CHAIN_NAT_IPV6=m
 
 CONFIG_IP6_NF_IPTABLES=m
 
@@ -464,7 +467,6 @@ CONFIG_CRYPTO_LZ4HC=m
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 # CONFIG_CRYPTO_HW is not set
 
-CONFIG_CRC_T10DIF=y
 
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_XZ_DEC_POWERPC=y
 
 CONFIG_XZ_DEC_IA64=y

+ 7 - 63
arch/m68k/kernel/head.S
View File 

@@ -275,7 +275,6 @@
 
 
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE
 
 #define CONSOLE
 
-#define CONSOLE_PENGUIN
 
 #endif
 
 
 #ifdef CONFIG_EARLY_PRINTK
 
@@ -658,27 +657,6 @@ ENTRY(__start)
 
 	movel	%a0@,%a1@
 
 #endif
 
 
-#if 0
 
-	/*
 
-	 * Clear the screen
 
-	 */
 
-	lea	%pc@(L(mac_videobase)),%a0
 
-	movel	%a0@,%a1
 
-	lea	%pc@(L(mac_dimensions)),%a0
 
-	movel	%a0@,%d1
 
-	swap	%d1		/* #rows is high bytes */
 
-	andl	#0xFFFF,%d1	/* rows */
 
-	subl	#10,%d1
 
-	lea	%pc@(L(mac_rowbytes)),%a0
 
-loopy2:
 
-	movel	%a0@,%d0
 
-	subql	#1,%d0
 
-loopx2:
 
-	moveb	#0x55, %a1@+
 
-	dbra	%d0,loopx2
 
-	dbra	%d1,loopy2
 
-#endif
 
-
 
 L(test_notmac):
 
 #endif /* CONFIG_MAC */
 
 
@@ -907,15 +885,15 @@ L(nothp):
 
  */
 
 #ifdef CONFIG_MAC
 
 	is_not_mac(L(nocon))
 
-#ifdef CONSOLE
 
+#  ifdef CONSOLE
 
 	console_init
 
-#ifdef CONSOLE_PENGUIN
 
+#    ifdef CONFIG_LOGO
 
 	console_put_penguin
 
-#endif	/* CONSOLE_PENGUIN */
 
+#    endif /* CONFIG_LOGO */
 
 	console_put_stats
 
-#endif	/* CONSOLE */
 
+#  endif /* CONSOLE */
 
 L(nocon):
 
-#endif	/* CONFIG_MAC */
 
+#endif /* CONFIG_MAC */
 
 
 
 	putc	'\n'
 
@@ -3324,14 +3302,13 @@ func_return	set_leds
 
 #define Lconsole_struct_num_columns	8
 
 #define Lconsole_struct_num_rows	12
 
 #define Lconsole_struct_left_edge	16
 
-#define Lconsole_struct_penguin_putc	20
 
 
 func_start	console_init,%a0-%a4/%d0-%d7
 
 	/*
 
 	 *	Some of the register usage that follows
 
 	 *		a0 = pointer to boot_info
 
 	 *		a1 = pointer to screen
 
-	 *		a2 = pointer to Lconsole_globals
 
+	 *		a2 = pointer to console_globals
 
 	 *		d3 = pixel width of screen
 
 	 *		d4 = pixel height of screen
 
 	 *		(d3,d4) ~= (x,y) of a point just below
 
@@ -3456,7 +3433,7 @@ func_start	console_put_stats,%a0/%d7
 
 
 func_return	console_put_stats
 
 
-#ifdef CONSOLE_PENGUIN
 
+#ifdef CONFIG_LOGO
 
 func_start	console_put_penguin,%a0-%a1/%d0-%d7
 
 	/*
 
 	 *	Get 'that_penguin' onto the screen in the upper right corner
 
@@ -3799,38 +3776,6 @@ L(console_plot_pixel_exit):
 
 func_return	console_plot_pixel
 
 #endif /* CONSOLE */
 
 
-#if 0
 
-/*
 
- * This is some old code lying around.  I don't believe
 
- * it's used or important anymore.  My guess is it contributed
 
- * to getting to this point, but it's done for now.
 
- * It was still in the 2.1.77 head.S, so it's still here.
 
- * (And still not used!)
 
- */
 
-L(showtest):
 
-	moveml	%a0/%d7,%sp@-
 
-	puts	"A="
 
-	putn	%a1
 
-
 
-	.long	0xf0119f15		| ptestr	#5,%a1@,#7,%a0
 
-
 
-	puts	"DA="
 
-	putn	%a0
 
-
 
-	puts	"D="
 
-	putn	%a0@
 
-
 
-	puts	"S="
 
-	lea	%pc@(L(mmu)),%a0
 
-	.long	0xf0106200		| pmove		%psr,%a0@
 
-	clrl	%d7
 
-	movew	%a0@,%d7
 
-	putn	%d7
 
-
 
-	putc	'\n'
 
-	moveml	%sp@+,%a0/%d7
 
-	rts
 
-#endif	/* 0 */
 
 
 __INITDATA
 
 	.align	4
 
@@ -3849,7 +3794,6 @@ L(console_globals):
 
 	.long	0		/* max num columns */
 
 	.long	0		/* max num rows */
 
 	.long	0		/* left edge */
 
-	.long	0		/* mac putc */
 
 L(console_font):
 
 	.long	0		/* pointer to console font (struct font_desc) */
 
 L(console_font_data):

+ 9 - 3
drivers/scsi/atari_scsi.c
View File 

@@ -90,6 +90,7 @@
 
 #include <linux/init.h>
 
 #include <linux/nvram.h>
 
 #include <linux/bitops.h>
 
+#include <linux/wait.h>
 
 
 #include <asm/setup.h>
 
 #include <asm/atarihw.h>
 
@@ -549,8 +550,10 @@ static void falcon_get_lock(void)
 
 
 	local_irq_save(flags);
 
 
-	while (!in_irq() && falcon_got_lock && stdma_others_waiting())
 
-		sleep_on(&falcon_fairness_wait);
 
+	wait_event_cmd(falcon_fairness_wait,
 
+		in_interrupt() || !falcon_got_lock || !stdma_others_waiting(),
 
+		local_irq_restore(flags),
 
+		local_irq_save(flags));
 
 
 	while (!falcon_got_lock) {
 
 		if (in_irq())
 
@@ -562,7 +565,10 @@ static void falcon_get_lock(void)
 
 			falcon_trying_lock = 0;
 
 			wake_up(&falcon_try_wait);
 
 		} else {
 
-			sleep_on(&falcon_try_wait);
 
+			wait_event_cmd(falcon_try_wait,
 
+				falcon_got_lock && !falcon_trying_lock,
 
+				local_irq_restore(flags),
 
+				local_irq_save(flags));
 
 		}
 
 	}