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

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

Pull m68k updates from Geert Uytterhoeven:

  - restore symbol versions for symbols exported from assembly

  - defconfig updates

  - Mac fixes

* tag 'm68k-for-v4.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/mac: Avoid soft-lockup warning after mach_power_off
  m68k/mac: Don't hang waiting for Cuda power-down command
  m68k: Restore symbol versions for symbols exported from assembly
  m68k/defconfig: Update defconfigs for v4.13-rc1
Linus Torvalds 8 years ago
parent
24e700e291 558d5ad276
commit
d1ce495676
14 changed files with 80 additions and 26 deletions
Split View Show Diff Stats
  1. 5 2
      arch/m68k/configs/amiga_defconfig
  2. 5 2
      arch/m68k/configs/apollo_defconfig
  3. 6 2
      arch/m68k/configs/atari_defconfig
  4. 5 2
      arch/m68k/configs/bvme6000_defconfig
  5. 5 2
      arch/m68k/configs/hp300_defconfig
  6. 5 2
      arch/m68k/configs/mac_defconfig
  7. 5 2
      arch/m68k/configs/multi_defconfig
  8. 5 2
      arch/m68k/configs/mvme147_defconfig
  9. 5 2
      arch/m68k/configs/mvme16x_defconfig
  10. 5 2
      arch/m68k/configs/q40_defconfig
  11. 5 2
      arch/m68k/configs/sun3_defconfig
  12. 5 2
      arch/m68k/configs/sun3x_defconfig
  13. 5 0
      arch/m68k/include/asm/asm-prototypes.h
  14. 14 2
      arch/m68k/mac/misc.c

+ 5 - 2
arch/m68k/configs/amiga_defconfig
View File 

@@ -49,6 +49,7 @@ CONFIG_PACKET=y
 
 CONFIG_PACKET_DIAG=m
 
 CONFIG_UNIX=y
 
 CONFIG_UNIX_DIAG=m
 
+CONFIG_TLS=m
 
 CONFIG_XFRM_MIGRATE=y
 
 CONFIG_NET_KEY=y
 
 CONFIG_INET=y
 
@@ -465,8 +466,10 @@ CONFIG_HID=m
 
 CONFIG_HIDRAW=y
 
 CONFIG_UHID=m
 
 # CONFIG_HID_GENERIC is not set
 
+# CONFIG_HID_ITE is not set
 
 # CONFIG_USB_SUPPORT is not set
 
 CONFIG_RTC_CLASS=y
 
+# CONFIG_RTC_NVMEM is not set
 
 CONFIG_RTC_DRV_MSM6242=m
 
 CONFIG_RTC_DRV_RP5C01=m
 
 # CONFIG_IOMMU_SUPPORT is not set
 
@@ -477,7 +480,6 @@ CONFIG_SERIAL_CONSOLE=y
 
 CONFIG_EXT4_FS=y
 
 CONFIG_REISERFS_FS=m
 
 CONFIG_JFS_FS=m
 
-CONFIG_XFS_FS=m
 
 CONFIG_OCFS2_FS=m
 
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
 
 CONFIG_FS_ENCRYPTION=m
 
@@ -587,12 +589,13 @@ CONFIG_TEST_BITMAP=m
 
 CONFIG_TEST_UUID=m
 
 CONFIG_TEST_RHASHTABLE=m
 
 CONFIG_TEST_HASH=m
 
-CONFIG_TEST_LKM=m
 
 CONFIG_TEST_USER_COPY=m
 
 CONFIG_TEST_BPF=m
 
 CONFIG_TEST_FIRMWARE=m
 
+CONFIG_TEST_SYSCTL=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_TEST_STATIC_KEYS=m
 
+CONFIG_TEST_KMOD=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
 CONFIG_HARDENED_USERCOPY=y

+ 5 - 2
arch/m68k/configs/apollo_defconfig
View File 

@@ -47,6 +47,7 @@ CONFIG_PACKET=y
 
 CONFIG_PACKET_DIAG=m
 
 CONFIG_UNIX=y
 
 CONFIG_UNIX_DIAG=m
 
+CONFIG_TLS=m
 
 CONFIG_XFRM_MIGRATE=y
 
 CONFIG_NET_KEY=y
 
 CONFIG_INET=y
 
@@ -427,8 +428,10 @@ CONFIG_HID=m
 
 CONFIG_HIDRAW=y
 
 CONFIG_UHID=m
 
 # CONFIG_HID_GENERIC is not set
 
+# CONFIG_HID_ITE is not set
 
 # CONFIG_USB_SUPPORT is not set
 
 CONFIG_RTC_CLASS=y
 
+# CONFIG_RTC_NVMEM is not set
 
 CONFIG_RTC_DRV_GENERIC=m
 
 # CONFIG_IOMMU_SUPPORT is not set
 
 CONFIG_HEARTBEAT=y
 
@@ -436,7 +439,6 @@ CONFIG_PROC_HARDWARE=y
 
 CONFIG_EXT4_FS=y
 
 CONFIG_REISERFS_FS=m
 
 CONFIG_JFS_FS=m
 
-CONFIG_XFS_FS=m
 
 CONFIG_OCFS2_FS=m
 
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
 
 CONFIG_FS_ENCRYPTION=m
 
@@ -546,12 +548,13 @@ CONFIG_TEST_BITMAP=m
 
 CONFIG_TEST_UUID=m
 
 CONFIG_TEST_RHASHTABLE=m
 
 CONFIG_TEST_HASH=m
 
-CONFIG_TEST_LKM=m
 
 CONFIG_TEST_USER_COPY=m
 
 CONFIG_TEST_BPF=m
 
 CONFIG_TEST_FIRMWARE=m
 
+CONFIG_TEST_SYSCTL=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_TEST_STATIC_KEYS=m
 
+CONFIG_TEST_KMOD=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
 CONFIG_HARDENED_USERCOPY=y

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

@@ -47,6 +47,7 @@ CONFIG_PACKET=y
 
 CONFIG_PACKET_DIAG=m
 
 CONFIG_UNIX=y
 
 CONFIG_UNIX_DIAG=m
 
+CONFIG_TLS=m
 
 CONFIG_XFRM_MIGRATE=y
 
 CONFIG_NET_KEY=y
 
 CONFIG_INET=y
 
@@ -442,7 +443,10 @@ CONFIG_DMASOUND_ATARI=m
 
 CONFIG_HID=m
 
 CONFIG_HIDRAW=y
 
 CONFIG_UHID=m
 
+# CONFIG_HID_GENERIC is not set
 
+# CONFIG_HID_ITE is not set
 
 CONFIG_RTC_CLASS=y
 
+# CONFIG_RTC_NVMEM is not set
 
 CONFIG_RTC_DRV_GENERIC=m
 
 # CONFIG_IOMMU_SUPPORT is not set
 
 CONFIG_HEARTBEAT=y
 
@@ -457,7 +461,6 @@ CONFIG_ATARI_DSP56K=m
 
 CONFIG_EXT4_FS=y
 
 CONFIG_REISERFS_FS=m
 
 CONFIG_JFS_FS=m
 
-CONFIG_XFS_FS=m
 
 CONFIG_OCFS2_FS=m
 
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
 
 CONFIG_FS_ENCRYPTION=m
 
@@ -567,12 +570,13 @@ CONFIG_TEST_BITMAP=m
 
 CONFIG_TEST_UUID=m
 
 CONFIG_TEST_RHASHTABLE=m
 
 CONFIG_TEST_HASH=m
 
-CONFIG_TEST_LKM=m
 
 CONFIG_TEST_USER_COPY=m
 
 CONFIG_TEST_BPF=m
 
 CONFIG_TEST_FIRMWARE=m
 
+CONFIG_TEST_SYSCTL=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_TEST_STATIC_KEYS=m
 
+CONFIG_TEST_KMOD=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
 CONFIG_HARDENED_USERCOPY=y

+ 5 - 2
arch/m68k/configs/bvme6000_defconfig
View File 

@@ -45,6 +45,7 @@ CONFIG_PACKET=y
 
 CONFIG_PACKET_DIAG=m
 
 CONFIG_UNIX=y
 
 CONFIG_UNIX_DIAG=m
 
+CONFIG_TLS=m
 
 CONFIG_XFRM_MIGRATE=y
 
 CONFIG_NET_KEY=y
 
 CONFIG_INET=y
 
@@ -420,15 +421,16 @@ CONFIG_HID=m
 
 CONFIG_HIDRAW=y
 
 CONFIG_UHID=m
 
 # CONFIG_HID_GENERIC is not set
 
+# CONFIG_HID_ITE is not set
 
 # CONFIG_USB_SUPPORT is not set
 
 CONFIG_RTC_CLASS=y
 
+# CONFIG_RTC_NVMEM is not set
 
 CONFIG_RTC_DRV_GENERIC=m
 
 # CONFIG_IOMMU_SUPPORT is not set
 
 CONFIG_PROC_HARDWARE=y
 
 CONFIG_EXT4_FS=y
 
 CONFIG_REISERFS_FS=m
 
 CONFIG_JFS_FS=m
 
-CONFIG_XFS_FS=m
 
 CONFIG_OCFS2_FS=m
 
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
 
 CONFIG_FS_ENCRYPTION=m
 
@@ -538,12 +540,13 @@ CONFIG_TEST_BITMAP=m
 
 CONFIG_TEST_UUID=m
 
 CONFIG_TEST_RHASHTABLE=m
 
 CONFIG_TEST_HASH=m
 
-CONFIG_TEST_LKM=m
 
 CONFIG_TEST_USER_COPY=m
 
 CONFIG_TEST_BPF=m
 
 CONFIG_TEST_FIRMWARE=m
 
+CONFIG_TEST_SYSCTL=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_TEST_STATIC_KEYS=m
 
+CONFIG_TEST_KMOD=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
 CONFIG_HARDENED_USERCOPY=y

+ 5 - 2
arch/m68k/configs/hp300_defconfig
View File 

@@ -47,6 +47,7 @@ CONFIG_PACKET=y
 
 CONFIG_PACKET_DIAG=m
 
 CONFIG_UNIX=y
 
 CONFIG_UNIX_DIAG=m
 
+CONFIG_TLS=m
 
 CONFIG_XFRM_MIGRATE=y
 
 CONFIG_NET_KEY=y
 
 CONFIG_INET=y
 
@@ -430,15 +431,16 @@ CONFIG_HID=m
 
 CONFIG_HIDRAW=y
 
 CONFIG_UHID=m
 
 # CONFIG_HID_GENERIC is not set
 
+# CONFIG_HID_ITE is not set
 
 # CONFIG_USB_SUPPORT is not set
 
 CONFIG_RTC_CLASS=y
 
+# CONFIG_RTC_NVMEM is not set
 
 CONFIG_RTC_DRV_GENERIC=m
 
 # CONFIG_IOMMU_SUPPORT is not set
 
 CONFIG_PROC_HARDWARE=y
 
 CONFIG_EXT4_FS=y
 
 CONFIG_REISERFS_FS=m
 
 CONFIG_JFS_FS=m
 
-CONFIG_XFS_FS=m
 
 CONFIG_OCFS2_FS=m
 
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
 
 CONFIG_FS_ENCRYPTION=m
 
@@ -548,12 +550,13 @@ CONFIG_TEST_BITMAP=m
 
 CONFIG_TEST_UUID=m
 
 CONFIG_TEST_RHASHTABLE=m
 
 CONFIG_TEST_HASH=m
 
-CONFIG_TEST_LKM=m
 
 CONFIG_TEST_USER_COPY=m
 
 CONFIG_TEST_BPF=m
 
 CONFIG_TEST_FIRMWARE=m
 
+CONFIG_TEST_SYSCTL=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_TEST_STATIC_KEYS=m
 
+CONFIG_TEST_KMOD=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
 CONFIG_HARDENED_USERCOPY=y

+ 5 - 2
arch/m68k/configs/mac_defconfig
View File 

@@ -46,6 +46,7 @@ CONFIG_PACKET=y
 
 CONFIG_PACKET_DIAG=m
 
 CONFIG_UNIX=y
 
 CONFIG_UNIX_DIAG=m
 
+CONFIG_TLS=m
 
 CONFIG_XFRM_MIGRATE=y
 
 CONFIG_NET_KEY=y
 
 CONFIG_INET=y
 
@@ -452,15 +453,16 @@ CONFIG_HID=m
 
 CONFIG_HIDRAW=y
 
 CONFIG_UHID=m
 
 # CONFIG_HID_GENERIC is not set
 
+# CONFIG_HID_ITE is not set
 
 # CONFIG_USB_SUPPORT is not set
 
 CONFIG_RTC_CLASS=y
 
+# CONFIG_RTC_NVMEM is not set
 
 CONFIG_RTC_DRV_GENERIC=m
 
 # CONFIG_IOMMU_SUPPORT is not set
 
 CONFIG_PROC_HARDWARE=y
 
 CONFIG_EXT4_FS=y
 
 CONFIG_REISERFS_FS=m
 
 CONFIG_JFS_FS=m
 
-CONFIG_XFS_FS=m
 
 CONFIG_OCFS2_FS=m
 
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
 
 CONFIG_FS_ENCRYPTION=m
 
@@ -570,12 +572,13 @@ CONFIG_TEST_BITMAP=m
 
 CONFIG_TEST_UUID=m
 
 CONFIG_TEST_RHASHTABLE=m
 
 CONFIG_TEST_HASH=m
 
-CONFIG_TEST_LKM=m
 
 CONFIG_TEST_USER_COPY=m
 
 CONFIG_TEST_BPF=m
 
 CONFIG_TEST_FIRMWARE=m
 
+CONFIG_TEST_SYSCTL=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_TEST_STATIC_KEYS=m
 
+CONFIG_TEST_KMOD=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
 CONFIG_HARDENED_USERCOPY=y

+ 5 - 2
arch/m68k/configs/multi_defconfig
View File 

@@ -56,6 +56,7 @@ CONFIG_PACKET=y
 
 CONFIG_PACKET_DIAG=m
 
 CONFIG_UNIX=y
 
 CONFIG_UNIX_DIAG=m
 
+CONFIG_TLS=m
 
 CONFIG_XFRM_MIGRATE=y
 
 CONFIG_NET_KEY=y
 
 CONFIG_INET=y
 
@@ -520,8 +521,10 @@ CONFIG_HID=m
 
 CONFIG_HIDRAW=y
 
 CONFIG_UHID=m
 
 # CONFIG_HID_GENERIC is not set
 
+# CONFIG_HID_ITE is not set
 
 # CONFIG_USB_SUPPORT is not set
 
 CONFIG_RTC_CLASS=y
 
+# CONFIG_RTC_NVMEM is not set
 
 CONFIG_RTC_DRV_MSM6242=m
 
 CONFIG_RTC_DRV_RP5C01=m
 
 CONFIG_RTC_DRV_GENERIC=m
 
@@ -540,7 +543,6 @@ CONFIG_SERIAL_CONSOLE=y
 
 CONFIG_EXT4_FS=y
 
 CONFIG_REISERFS_FS=m
 
 CONFIG_JFS_FS=m
 
-CONFIG_XFS_FS=m
 
 CONFIG_OCFS2_FS=m
 
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
 
 CONFIG_FS_ENCRYPTION=m
 
@@ -650,12 +652,13 @@ CONFIG_TEST_BITMAP=m
 
 CONFIG_TEST_UUID=m
 
 CONFIG_TEST_RHASHTABLE=m
 
 CONFIG_TEST_HASH=m
 
-CONFIG_TEST_LKM=m
 
 CONFIG_TEST_USER_COPY=m
 
 CONFIG_TEST_BPF=m
 
 CONFIG_TEST_FIRMWARE=m
 
+CONFIG_TEST_SYSCTL=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_TEST_STATIC_KEYS=m
 
+CONFIG_TEST_KMOD=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
 CONFIG_HARDENED_USERCOPY=y

+ 5 - 2
arch/m68k/configs/mvme147_defconfig
View File 

@@ -44,6 +44,7 @@ CONFIG_PACKET=y
 
 CONFIG_PACKET_DIAG=m
 
 CONFIG_UNIX=y
 
 CONFIG_UNIX_DIAG=m
 
+CONFIG_TLS=m
 
 CONFIG_XFRM_MIGRATE=y
 
 CONFIG_NET_KEY=y
 
 CONFIG_INET=y
 
@@ -420,15 +421,16 @@ CONFIG_HID=m
 
 CONFIG_HIDRAW=y
 
 CONFIG_UHID=m
 
 # CONFIG_HID_GENERIC is not set
 
+# CONFIG_HID_ITE is not set
 
 # CONFIG_USB_SUPPORT is not set
 
 CONFIG_RTC_CLASS=y
 
+# CONFIG_RTC_NVMEM is not set
 
 CONFIG_RTC_DRV_GENERIC=m
 
 # CONFIG_IOMMU_SUPPORT is not set
 
 CONFIG_PROC_HARDWARE=y
 
 CONFIG_EXT4_FS=y
 
 CONFIG_REISERFS_FS=m
 
 CONFIG_JFS_FS=m
 
-CONFIG_XFS_FS=m
 
 CONFIG_OCFS2_FS=m
 
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
 
 CONFIG_FS_ENCRYPTION=m
 
@@ -538,12 +540,13 @@ CONFIG_TEST_BITMAP=m
 
 CONFIG_TEST_UUID=m
 
 CONFIG_TEST_RHASHTABLE=m
 
 CONFIG_TEST_HASH=m
 
-CONFIG_TEST_LKM=m
 
 CONFIG_TEST_USER_COPY=m
 
 CONFIG_TEST_BPF=m
 
 CONFIG_TEST_FIRMWARE=m
 
+CONFIG_TEST_SYSCTL=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_TEST_STATIC_KEYS=m
 
+CONFIG_TEST_KMOD=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
 CONFIG_HARDENED_USERCOPY=y

+ 5 - 2
arch/m68k/configs/mvme16x_defconfig
View File 

@@ -45,6 +45,7 @@ CONFIG_PACKET=y
 
 CONFIG_PACKET_DIAG=m
 
 CONFIG_UNIX=y
 
 CONFIG_UNIX_DIAG=m
 
+CONFIG_TLS=m
 
 CONFIG_XFRM_MIGRATE=y
 
 CONFIG_NET_KEY=y
 
 CONFIG_INET=y
 
@@ -420,15 +421,16 @@ CONFIG_HID=m
 
 CONFIG_HIDRAW=y
 
 CONFIG_UHID=m
 
 # CONFIG_HID_GENERIC is not set
 
+# CONFIG_HID_ITE is not set
 
 # CONFIG_USB_SUPPORT is not set
 
 CONFIG_RTC_CLASS=y
 
+# CONFIG_RTC_NVMEM is not set
 
 CONFIG_RTC_DRV_GENERIC=m
 
 # CONFIG_IOMMU_SUPPORT is not set
 
 CONFIG_PROC_HARDWARE=y
 
 CONFIG_EXT4_FS=y
 
 CONFIG_REISERFS_FS=m
 
 CONFIG_JFS_FS=m
 
-CONFIG_XFS_FS=m
 
 CONFIG_OCFS2_FS=m
 
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
 
 CONFIG_FS_ENCRYPTION=m
 
@@ -538,12 +540,13 @@ CONFIG_TEST_BITMAP=m
 
 CONFIG_TEST_UUID=m
 
 CONFIG_TEST_RHASHTABLE=m
 
 CONFIG_TEST_HASH=m
 
-CONFIG_TEST_LKM=m
 
 CONFIG_TEST_USER_COPY=m
 
 CONFIG_TEST_BPF=m
 
 CONFIG_TEST_FIRMWARE=m
 
+CONFIG_TEST_SYSCTL=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_TEST_STATIC_KEYS=m
 
+CONFIG_TEST_KMOD=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
 CONFIG_HARDENED_USERCOPY=y

+ 5 - 2
arch/m68k/configs/q40_defconfig
View File 

@@ -45,6 +45,7 @@ CONFIG_PACKET=y
 
 CONFIG_PACKET_DIAG=m
 
 CONFIG_UNIX=y
 
 CONFIG_UNIX_DIAG=m
 
+CONFIG_TLS=m
 
 CONFIG_XFRM_MIGRATE=y
 
 CONFIG_NET_KEY=y
 
 CONFIG_INET=y
 
@@ -442,8 +443,10 @@ CONFIG_HID=m
 
 CONFIG_HIDRAW=y
 
 CONFIG_UHID=m
 
 # CONFIG_HID_GENERIC is not set
 
+# CONFIG_HID_ITE is not set
 
 # CONFIG_USB_SUPPORT is not set
 
 CONFIG_RTC_CLASS=y
 
+# CONFIG_RTC_NVMEM is not set
 
 CONFIG_RTC_DRV_GENERIC=m
 
 # CONFIG_IOMMU_SUPPORT is not set
 
 CONFIG_HEARTBEAT=y
 
@@ -451,7 +454,6 @@ CONFIG_PROC_HARDWARE=y
 
 CONFIG_EXT4_FS=y
 
 CONFIG_REISERFS_FS=m
 
 CONFIG_JFS_FS=m
 
-CONFIG_XFS_FS=m
 
 CONFIG_OCFS2_FS=m
 
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
 
 CONFIG_FS_ENCRYPTION=m
 
@@ -561,12 +563,13 @@ CONFIG_TEST_BITMAP=m
 
 CONFIG_TEST_UUID=m
 
 CONFIG_TEST_RHASHTABLE=m
 
 CONFIG_TEST_HASH=m
 
-CONFIG_TEST_LKM=m
 
 CONFIG_TEST_USER_COPY=m
 
 CONFIG_TEST_BPF=m
 
 CONFIG_TEST_FIRMWARE=m
 
+CONFIG_TEST_SYSCTL=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_TEST_STATIC_KEYS=m
 
+CONFIG_TEST_KMOD=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
 CONFIG_HARDENED_USERCOPY=y

+ 5 - 2
arch/m68k/configs/sun3_defconfig
View File 

@@ -42,6 +42,7 @@ CONFIG_PACKET=y
 
 CONFIG_PACKET_DIAG=m
 
 CONFIG_UNIX=y
 
 CONFIG_UNIX_DIAG=m
 
+CONFIG_TLS=m
 
 CONFIG_XFRM_MIGRATE=y
 
 CONFIG_NET_KEY=y
 
 CONFIG_INET=y
 
@@ -422,15 +423,16 @@ CONFIG_HID=m
 
 CONFIG_HIDRAW=y
 
 CONFIG_UHID=m
 
 # CONFIG_HID_GENERIC is not set
 
+# CONFIG_HID_ITE is not set
 
 # CONFIG_USB_SUPPORT is not set
 
 CONFIG_RTC_CLASS=y
 
+# CONFIG_RTC_NVMEM is not set
 
 CONFIG_RTC_DRV_GENERIC=m
 
 # CONFIG_IOMMU_SUPPORT is not set
 
 CONFIG_PROC_HARDWARE=y
 
 CONFIG_EXT4_FS=y
 
 CONFIG_REISERFS_FS=m
 
 CONFIG_JFS_FS=m
 
-CONFIG_XFS_FS=m
 
 CONFIG_OCFS2_FS=m
 
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
 
 CONFIG_FS_ENCRYPTION=m
 
@@ -540,12 +542,13 @@ CONFIG_TEST_BITMAP=m
 
 CONFIG_TEST_UUID=m
 
 CONFIG_TEST_RHASHTABLE=m
 
 CONFIG_TEST_HASH=m
 
-CONFIG_TEST_LKM=m
 
 CONFIG_TEST_USER_COPY=m
 
 CONFIG_TEST_BPF=m
 
 CONFIG_TEST_FIRMWARE=m
 
+CONFIG_TEST_SYSCTL=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_TEST_STATIC_KEYS=m
 
+CONFIG_TEST_KMOD=m
 
 CONFIG_ENCRYPTED_KEYS=m
 
 CONFIG_HARDENED_USERCOPY=y
 
 CONFIG_CRYPTO_RSA=m

+ 5 - 2
arch/m68k/configs/sun3x_defconfig
View File 

@@ -42,6 +42,7 @@ CONFIG_PACKET=y
 
 CONFIG_PACKET_DIAG=m
 
 CONFIG_UNIX=y
 
 CONFIG_UNIX_DIAG=m
 
+CONFIG_TLS=m
 
 CONFIG_XFRM_MIGRATE=y
 
 CONFIG_NET_KEY=y
 
 CONFIG_INET=y
 
@@ -422,15 +423,16 @@ CONFIG_HID=m
 
 CONFIG_HIDRAW=y
 
 CONFIG_UHID=m
 
 # CONFIG_HID_GENERIC is not set
 
+# CONFIG_HID_ITE is not set
 
 # CONFIG_USB_SUPPORT is not set
 
 CONFIG_RTC_CLASS=y
 
+# CONFIG_RTC_NVMEM is not set
 
 CONFIG_RTC_DRV_GENERIC=m
 
 # CONFIG_IOMMU_SUPPORT is not set
 
 CONFIG_PROC_HARDWARE=y
 
 CONFIG_EXT4_FS=y
 
 CONFIG_REISERFS_FS=m
 
 CONFIG_JFS_FS=m
 
-CONFIG_XFS_FS=m
 
 CONFIG_OCFS2_FS=m
 
 # CONFIG_OCFS2_DEBUG_MASKLOG is not set
 
 CONFIG_FS_ENCRYPTION=m
 
@@ -540,12 +542,13 @@ CONFIG_TEST_BITMAP=m
 
 CONFIG_TEST_UUID=m
 
 CONFIG_TEST_RHASHTABLE=m
 
 CONFIG_TEST_HASH=m
 
-CONFIG_TEST_LKM=m
 
 CONFIG_TEST_USER_COPY=m
 
 CONFIG_TEST_BPF=m
 
 CONFIG_TEST_FIRMWARE=m
 
+CONFIG_TEST_SYSCTL=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_TEST_STATIC_KEYS=m
 
+CONFIG_TEST_KMOD=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
 CONFIG_HARDENED_USERCOPY=y

+ 5 - 0
arch/m68k/include/asm/asm-prototypes.h
View File 

@@ -0,0 +1,5 @@
 
+extern int __divsi3(int, int);
 
+extern int __modsi3(int, int);
 
+extern int __mulsi3(int, int);
 
+extern unsigned int __udivsi3(unsigned int, unsigned int);
 
+extern unsigned int __umodsi3(unsigned int, unsigned int);

+ 14 - 2
arch/m68k/mac/misc.c
View File 

@@ -357,6 +357,17 @@ static void cuda_shutdown(void)
 
 	struct adb_request req;
 
 	if (cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_POWERDOWN) < 0)
 
 		return;
 
+
 
+	/* Avoid infinite polling loop when PSU is not under Cuda control */
 
+	switch (macintosh_config->ident) {
 
+	case MAC_MODEL_C660:
 
+	case MAC_MODEL_Q605:
 
+	case MAC_MODEL_Q605_ACC:
 
+	case MAC_MODEL_P475:
 
+	case MAC_MODEL_P475F:
 
+		return;
 
+	}
 
+
 
 	while (!req.complete)
 
 		cuda_poll();
 
 }
 
@@ -463,8 +474,9 @@ void mac_poweroff(void)
 
 		pmu_shutdown();
 
 #endif
 
 	}
 
-	local_irq_enable();
 
+
 
 	pr_crit("It is now safe to turn off your Macintosh.\n");
 
+	local_irq_disable();
 
 	while(1);
 
 }
 
 
@@ -554,8 +566,8 @@ void mac_reset(void)
 
 	}
 
 
 	/* should never get here */
 
-	local_irq_enable();
 
 	pr_crit("Restart failed. Please restart manually.\n");
 
+	local_irq_disable();
 
 	while(1);
 
 }