Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix DMA nodes in the MPC8610 HPCD device tree
[POWERPC] Export empty_zero_page and copy_page in arch/ppc
[POWERPC] Add "memory" clobber to MMIO accessors
[POWERPC] pasemi: update pasemi_defconfig, enable electra_cf
electra_cf: Add MODULE_DEVICE_TABLE()

+126 -71
+5 -5
arch/powerpc/boot/dts/mpc8610_hpcd.dts
··· 251 251 dma@c300 { 252 252 #address-cells = <1>; 253 253 #size-cells = <1>; 254 - compatible = "fsl,mpc8610-dma", "fsl,mpc8540-dma"; 254 + compatible = "fsl,mpc8610-dma", "fsl,eloplus-dma"; 255 255 cell-index = <1>; 256 256 reg = <0xc300 0x4>; /* DMA general status register */ 257 257 ranges = <0x0 0xc100 0x200>; 258 258 259 259 dma-channel@0 { 260 260 compatible = "fsl,mpc8610-dma-channel", 261 - "fsl,mpc8540-dma-channel"; 261 + "fsl,eloplus-dma-channel"; 262 262 cell-index = <0>; 263 263 reg = <0x0 0x80>; 264 264 interrupt-parent = <&mpic>; ··· 266 266 }; 267 267 dma-channel@1 { 268 268 compatible = "fsl,mpc8610-dma-channel", 269 - "fsl,mpc8540-dma-channel"; 269 + "fsl,eloplus-dma-channel"; 270 270 cell-index = <1>; 271 271 reg = <0x80 0x80>; 272 272 interrupt-parent = <&mpic>; ··· 274 274 }; 275 275 dma-channel@2 { 276 276 compatible = "fsl,mpc8610-dma-channel", 277 - "fsl,mpc8540-dma-channel"; 277 + "fsl,eloplus-dma-channel"; 278 278 cell-index = <2>; 279 279 reg = <0x100 0x80>; 280 280 interrupt-parent = <&mpic>; ··· 282 282 }; 283 283 dma-channel@3 { 284 284 compatible = "fsl,mpc8610-dma-channel", 285 - "fsl,mpc8540-dma-channel"; 285 + "fsl,eloplus-dma-channel"; 286 286 cell-index = <3>; 287 287 reg = <0x180 0x80>; 288 288 interrupt-parent = <&mpic>;
+111 -61
arch/powerpc/configs/pasemi_defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.25-rc6 4 - # Tue Mar 25 10:25:48 2008 3 + # Linux kernel version: 2.6.26-rc3 4 + # Tue May 27 16:08:06 2008 5 5 # 6 6 CONFIG_PPC64=y 7 7 ··· 29 29 CONFIG_GENERIC_HARDIRQS=y 30 30 CONFIG_HAVE_SETUP_PER_CPU_AREA=y 31 31 CONFIG_IRQ_PER_CPU=y 32 + CONFIG_STACKTRACE_SUPPORT=y 33 + CONFIG_TRACE_IRQFLAGS_SUPPORT=y 34 + CONFIG_LOCKDEP_SUPPORT=y 32 35 CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33 36 CONFIG_ARCH_HAS_ILOG2_U32=y 34 37 CONFIG_ARCH_HAS_ILOG2_U64=y ··· 90 87 CONFIG_SYSCTL=y 91 88 # CONFIG_EMBEDDED is not set 92 89 CONFIG_SYSCTL_SYSCALL=y 90 + CONFIG_SYSCTL_SYSCALL_CHECK=y 93 91 CONFIG_KALLSYMS=y 94 92 # CONFIG_KALLSYMS_ALL is not set 95 93 # CONFIG_KALLSYMS_EXTRA_PASS is not set ··· 119 115 # CONFIG_KPROBES is not set 120 116 CONFIG_HAVE_KPROBES=y 121 117 CONFIG_HAVE_KRETPROBES=y 118 + # CONFIG_HAVE_DMA_ATTRS is not set 122 119 CONFIG_PROC_PAGE_MONITOR=y 123 120 CONFIG_SLABINFO=y 124 121 CONFIG_RT_MUTEXES=y 125 122 # CONFIG_TINY_SHMEM is not set 126 123 CONFIG_BASE_SMALL=0 127 124 CONFIG_MODULES=y 125 + # CONFIG_MODULE_FORCE_LOAD is not set 128 126 CONFIG_MODULE_UNLOAD=y 129 127 # CONFIG_MODULE_FORCE_UNLOAD is not set 130 128 # CONFIG_MODVERSIONS is not set ··· 173 167 CONFIG_PPC_PASEMI_IOMMU=y 174 168 # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set 175 169 CONFIG_PPC_PASEMI_MDIO=y 176 - # CONFIG_PPC_CELLEB is not set 177 170 # CONFIG_PPC_PS3 is not set 178 171 # CONFIG_PPC_CELL is not set 179 172 # CONFIG_PPC_CELL_NATIVE is not set 180 173 # CONFIG_PPC_IBM_CELL_BLADE is not set 174 + # CONFIG_PPC_CELLEB is not set 181 175 # CONFIG_PQ2ADS is not set 182 176 CONFIG_PPC_NATIVE=y 183 177 # CONFIG_IPIC is not set ··· 198 192 CONFIG_CPU_FREQ_STAT=y 199 193 # CONFIG_CPU_FREQ_STAT_DETAILS is not set 200 194 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y 195 + # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set 201 196 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set 202 197 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set 203 198 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set ··· 233 226 CONFIG_BINFMT_ELF=y 234 227 CONFIG_COMPAT_BINFMT_ELF=y 235 228 # CONFIG_BINFMT_MISC is not set 236 - CONFIG_FORCE_MAX_ZONEORDER=9 237 229 CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y 238 230 CONFIG_IOMMU_VMERGE=y 239 231 CONFIG_IOMMU_HELPER=y ··· 255 249 CONFIG_FLAT_NODE_MEM_MAP=y 256 250 # CONFIG_SPARSEMEM_STATIC is not set 257 251 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 252 + CONFIG_PAGEFLAGS_EXTENDED=y 258 253 CONFIG_SPLIT_PTLOCK_CPUS=4 259 254 CONFIG_RESOURCES_64BIT=y 260 255 CONFIG_ZONE_DMA_FLAG=1 261 256 CONFIG_BOUNCE=y 262 257 CONFIG_PPC_HAS_HASH_64K=y 263 258 CONFIG_PPC_64K_PAGES=y 259 + CONFIG_FORCE_MAX_ZONEORDER=9 264 260 # CONFIG_PPC_SUBPAGE_PROT is not set 265 261 # CONFIG_SCHED_SMT is not set 266 262 CONFIG_PROC_DEVICETREE=y ··· 298 290 # CONFIG_YENTA is not set 299 291 # CONFIG_PD6729 is not set 300 292 # CONFIG_I82092 is not set 301 - # CONFIG_ELECTRA_CF is not set 293 + CONFIG_ELECTRA_CF=y 302 294 # CONFIG_HOTPLUG_PCI is not set 295 + # CONFIG_HAS_RAPIDIO is not set 296 + CONFIG_PAGE_OFFSET=0xc000000000000000 303 297 CONFIG_KERNEL_START=0xc000000000000000 298 + CONFIG_PHYSICAL_START=0x00000000 304 299 305 300 # 306 301 # Networking ··· 352 341 CONFIG_DEFAULT_TCP_CONG="cubic" 353 342 # CONFIG_TCP_MD5SIG is not set 354 343 # CONFIG_IPV6 is not set 355 - # CONFIG_INET6_XFRM_TUNNEL is not set 356 - # CONFIG_INET6_TUNNEL is not set 357 344 # CONFIG_NETWORK_SECMARK is not set 358 345 # CONFIG_NETFILTER is not set 359 346 # CONFIG_IP_DCCP is not set ··· 482 473 # 483 474 # CONFIG_MTD_UBI is not set 484 475 CONFIG_OF_DEVICE=y 476 + CONFIG_OF_I2C=y 485 477 # CONFIG_PARPORT is not set 486 478 CONFIG_BLK_DEV=y 487 479 # CONFIG_BLK_DEV_FD is not set ··· 530 520 # 531 521 # IDE chipset support/bugfixes 532 522 # 533 - # CONFIG_IDE_GENERIC is not set 534 523 # CONFIG_BLK_DEV_PLATFORM is not set 535 524 536 525 # ··· 563 554 # CONFIG_BLK_DEV_VIA82CXXX is not set 564 555 # CONFIG_BLK_DEV_TC86C001 is not set 565 556 # CONFIG_BLK_DEV_IDEDMA is not set 566 - CONFIG_IDE_ARCH_OBSOLETE_INIT=y 557 + # CONFIG_BLK_DEV_HD_ONLY is not set 567 558 # CONFIG_BLK_DEV_HD is not set 568 559 569 560 # ··· 641 632 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 642 633 CONFIG_ATA=y 643 634 # CONFIG_ATA_NONSTANDARD is not set 635 + CONFIG_SATA_PMP=y 644 636 # CONFIG_SATA_AHCI is not set 637 + CONFIG_SATA_SIL24=y 638 + CONFIG_ATA_SFF=y 645 639 # CONFIG_SATA_SVW is not set 646 640 # CONFIG_ATA_PIIX is not set 647 641 CONFIG_SATA_MV=y ··· 654 642 # CONFIG_SATA_PROMISE is not set 655 643 # CONFIG_SATA_SX4 is not set 656 644 # CONFIG_SATA_SIL is not set 657 - CONFIG_SATA_SIL24=y 658 645 # CONFIG_SATA_SIS is not set 659 646 # CONFIG_SATA_ULI is not set 660 647 # CONFIG_SATA_VIA is not set ··· 700 689 # CONFIG_PATA_WINBOND is not set 701 690 CONFIG_PATA_PLATFORM=y 702 691 CONFIG_PATA_OF_PLATFORM=y 692 + # CONFIG_PATA_SCH is not set 703 693 CONFIG_MD=y 704 694 CONFIG_BLK_DEV_MD=y 705 695 CONFIG_MD_LINEAR=y ··· 803 791 # CONFIG_SIS190 is not set 804 792 # CONFIG_SKGE is not set 805 793 # CONFIG_SKY2 is not set 806 - # CONFIG_SK98LIN is not set 807 794 # CONFIG_VIA_VELOCITY is not set 808 795 CONFIG_TIGON3=y 809 796 # CONFIG_BNX2 is not set ··· 821 810 # CONFIG_MLX4_CORE is not set 822 811 # CONFIG_TEHUTI is not set 823 812 # CONFIG_BNX2X is not set 813 + # CONFIG_SFC is not set 824 814 # CONFIG_TR is not set 825 815 826 816 # ··· 829 817 # 830 818 # CONFIG_WLAN_PRE80211 is not set 831 819 # CONFIG_WLAN_80211 is not set 820 + # CONFIG_IWLWIFI_LEDS is not set 832 821 833 822 # 834 823 # USB Network Adapters ··· 903 890 CONFIG_VT_CONSOLE=y 904 891 CONFIG_HW_CONSOLE=y 905 892 # CONFIG_VT_HW_CONSOLE_BINDING is not set 893 + CONFIG_DEVKMEM=y 906 894 # CONFIG_SERIAL_NONSTANDARD is not set 907 895 # CONFIG_NOZOMI is not set 908 896 ··· 931 917 # CONFIG_IPMI_HANDLER is not set 932 918 CONFIG_HW_RANDOM=y 933 919 CONFIG_HW_RANDOM_PASEMI=y 934 - # CONFIG_GEN_RTC is not set 935 920 # CONFIG_R3964 is not set 936 921 # CONFIG_APPLICOM is not set 937 922 ··· 949 936 CONFIG_I2C=y 950 937 CONFIG_I2C_BOARDINFO=y 951 938 CONFIG_I2C_CHARDEV=y 952 - 953 - # 954 - # I2C Algorithms 955 - # 956 939 CONFIG_I2C_ALGOBIT=y 957 - CONFIG_I2C_ALGOPCF=y 958 - CONFIG_I2C_ALGOPCA=y 959 940 960 941 # 961 942 # I2C Hardware Bus support ··· 978 971 # CONFIG_I2C_VIA is not set 979 972 # CONFIG_I2C_VIAPRO is not set 980 973 # CONFIG_I2C_VOODOO3 is not set 974 + # CONFIG_I2C_PCA_PLATFORM is not set 981 975 982 976 # 983 977 # Miscellaneous I2C Chip support ··· 988 980 # CONFIG_SENSORS_PCF8574 is not set 989 981 # CONFIG_PCF8575 is not set 990 982 # CONFIG_SENSORS_PCF8591 is not set 991 - # CONFIG_TPS65010 is not set 992 983 # CONFIG_SENSORS_MAX6875 is not set 993 984 # CONFIG_SENSORS_TSL2550 is not set 994 985 # CONFIG_I2C_DEBUG_CORE is not set 995 986 # CONFIG_I2C_DEBUG_ALGO is not set 996 987 # CONFIG_I2C_DEBUG_BUS is not set 997 988 # CONFIG_I2C_DEBUG_CHIP is not set 998 - 999 - # 1000 - # SPI support 1001 - # 1002 989 # CONFIG_SPI is not set 1003 - # CONFIG_SPI_MASTER is not set 1004 990 # CONFIG_W1 is not set 1005 991 # CONFIG_POWER_SUPPLY is not set 1006 992 CONFIG_HWMON=y ··· 1064 1062 # Multifunction device drivers 1065 1063 # 1066 1064 # CONFIG_MFD_SM501 is not set 1065 + # CONFIG_HTC_PASIC3 is not set 1067 1066 1068 1067 # 1069 1068 # Multimedia devices 1070 1069 # 1070 + 1071 + # 1072 + # Multimedia core support 1073 + # 1071 1074 # CONFIG_VIDEO_DEV is not set 1072 1075 # CONFIG_DVB_CORE is not set 1076 + # CONFIG_VIDEO_MEDIA is not set 1077 + 1078 + # 1079 + # Multimedia drivers 1080 + # 1073 1081 CONFIG_DAB=y 1074 1082 # CONFIG_USB_DABUSB is not set 1075 1083 ··· 1106 1094 # CONFIG_FB_SYS_FILLRECT is not set 1107 1095 # CONFIG_FB_SYS_COPYAREA is not set 1108 1096 # CONFIG_FB_SYS_IMAGEBLIT is not set 1097 + # CONFIG_FB_FOREIGN_ENDIAN is not set 1109 1098 # CONFIG_FB_SYS_FOPS is not set 1110 - CONFIG_FB_DEFERRED_IO=y 1111 1099 # CONFIG_FB_SVGALIB is not set 1112 1100 CONFIG_FB_MACMODES=y 1113 1101 CONFIG_FB_BACKLIGHT=y ··· 1225 1213 # CONFIG_SND_AU8810 is not set 1226 1214 # CONFIG_SND_AU8820 is not set 1227 1215 # CONFIG_SND_AU8830 is not set 1216 + # CONFIG_SND_AW2 is not set 1228 1217 # CONFIG_SND_AZT3328 is not set 1229 1218 # CONFIG_SND_BT87X is not set 1230 1219 # CONFIG_SND_CA0106 is not set ··· 1305 1292 # CONFIG_SND_SOC is not set 1306 1293 1307 1294 # 1308 - # SoC Audio support for SuperH 1295 + # ALSA SoC audio for Freescale SOCs 1309 1296 # 1310 1297 1311 1298 # 1312 - # ALSA SoC audio for Freescale SOCs 1299 + # SoC Audio for the Texas Instruments OMAP 1313 1300 # 1314 1301 1315 1302 # ··· 1347 1334 # 1348 1335 # USB Host Controller Drivers 1349 1336 # 1337 + # CONFIG_USB_C67X00_HCD is not set 1350 1338 CONFIG_USB_EHCI_HCD=y 1351 1339 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1352 1340 # CONFIG_USB_EHCI_TT_NEWSCHED is not set 1353 1341 CONFIG_USB_EHCI_HCD_PPC_OF=y 1354 1342 # CONFIG_USB_ISP116X_HCD is not set 1343 + # CONFIG_USB_ISP1760_HCD is not set 1355 1344 CONFIG_USB_OHCI_HCD=y 1356 1345 # CONFIG_USB_OHCI_HCD_PPC_OF is not set 1357 1346 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set ··· 1369 1354 # 1370 1355 # CONFIG_USB_ACM is not set 1371 1356 # CONFIG_USB_PRINTER is not set 1357 + # CONFIG_USB_WDM is not set 1372 1358 1373 1359 # 1374 1360 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' ··· 1391 1375 # CONFIG_USB_STORAGE_ALAUDA is not set 1392 1376 # CONFIG_USB_STORAGE_ONETOUCH is not set 1393 1377 # CONFIG_USB_STORAGE_KARMA is not set 1378 + # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1394 1379 CONFIG_USB_LIBUSUAL=y 1395 1380 1396 1381 # ··· 1433 1416 # CONFIG_MMC is not set 1434 1417 # CONFIG_MEMSTICK is not set 1435 1418 # CONFIG_NEW_LEDS is not set 1419 + # CONFIG_ACCESSIBILITY is not set 1436 1420 # CONFIG_INFINIBAND is not set 1437 1421 CONFIG_EDAC=y 1438 1422 ··· 1493 1475 # on-CPU RTC drivers 1494 1476 # 1495 1477 # CONFIG_DMADEVICES is not set 1496 - 1497 - # 1498 - # Userspace I/O 1499 - # 1500 1478 # CONFIG_UIO is not set 1501 1479 1502 1480 # ··· 1590 1576 CONFIG_NFS_V3=y 1591 1577 # CONFIG_NFS_V3_ACL is not set 1592 1578 # CONFIG_NFS_V4 is not set 1593 - # CONFIG_NFS_DIRECTIO is not set 1594 1579 CONFIG_NFSD=y 1595 1580 CONFIG_NFSD_V3=y 1596 1581 # CONFIG_NFSD_V3_ACL is not set 1597 1582 CONFIG_NFSD_V4=y 1598 - CONFIG_NFSD_TCP=y 1599 1583 CONFIG_ROOT_NFS=y 1600 1584 CONFIG_LOCKD=y 1601 1585 CONFIG_LOCKD_V4=y ··· 1677 1665 # Library routines 1678 1666 # 1679 1667 CONFIG_BITREVERSE=y 1668 + # CONFIG_GENERIC_FIND_FIRST_BIT is not set 1680 1669 CONFIG_CRC_CCITT=y 1681 1670 # CONFIG_CRC16 is not set 1682 - # CONFIG_CRC_ITU_T is not set 1671 + CONFIG_CRC_ITU_T=y 1683 1672 CONFIG_CRC32=y 1684 1673 # CONFIG_CRC7 is not set 1685 1674 CONFIG_LIBCRC32C=m ··· 1690 1677 CONFIG_HAS_IOMEM=y 1691 1678 CONFIG_HAS_IOPORT=y 1692 1679 CONFIG_HAS_DMA=y 1680 + CONFIG_HAVE_LMB=y 1693 1681 1694 1682 # 1695 1683 # Kernel hacking ··· 1698 1684 # CONFIG_PRINTK_TIME is not set 1699 1685 CONFIG_ENABLE_WARN_DEPRECATED=y 1700 1686 CONFIG_ENABLE_MUST_CHECK=y 1687 + CONFIG_FRAME_WARN=2048 1701 1688 CONFIG_MAGIC_SYSRQ=y 1702 1689 # CONFIG_UNUSED_SYMBOLS is not set 1703 1690 # CONFIG_DEBUG_FS is not set ··· 1709 1694 # CONFIG_SCHED_DEBUG is not set 1710 1695 # CONFIG_SCHEDSTATS is not set 1711 1696 # CONFIG_TIMER_STATS is not set 1697 + # CONFIG_DEBUG_OBJECTS is not set 1712 1698 # CONFIG_SLUB_DEBUG_ON is not set 1713 1699 # CONFIG_SLUB_STATS is not set 1714 1700 # CONFIG_DEBUG_RT_MUTEXES is not set 1715 1701 # CONFIG_RT_MUTEX_TESTER is not set 1716 1702 # CONFIG_DEBUG_SPINLOCK is not set 1717 1703 # CONFIG_DEBUG_MUTEXES is not set 1704 + # CONFIG_DEBUG_LOCK_ALLOC is not set 1705 + # CONFIG_PROVE_LOCKING is not set 1706 + # CONFIG_LOCK_STAT is not set 1718 1707 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1719 1708 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1720 1709 # CONFIG_DEBUG_KOBJECT is not set 1721 1710 CONFIG_DEBUG_BUGVERBOSE=y 1722 1711 # CONFIG_DEBUG_INFO is not set 1723 1712 # CONFIG_DEBUG_VM is not set 1713 + # CONFIG_DEBUG_WRITECOUNT is not set 1724 1714 # CONFIG_DEBUG_LIST is not set 1725 1715 # CONFIG_DEBUG_SG is not set 1726 1716 # CONFIG_BOOT_PRINTK_DELAY is not set ··· 1755 1735 CONFIG_ASYNC_MEMCPY=y 1756 1736 CONFIG_ASYNC_XOR=y 1757 1737 CONFIG_CRYPTO=y 1738 + 1739 + # 1740 + # Crypto core or helper 1741 + # 1758 1742 CONFIG_CRYPTO_ALGAPI=y 1759 1743 CONFIG_CRYPTO_AEAD=y 1760 1744 CONFIG_CRYPTO_BLKCIPHER=y 1761 - # CONFIG_CRYPTO_SEQIV is not set 1762 1745 CONFIG_CRYPTO_HASH=y 1763 1746 CONFIG_CRYPTO_MANAGER=y 1747 + # CONFIG_CRYPTO_GF128MUL is not set 1748 + # CONFIG_CRYPTO_NULL is not set 1749 + # CONFIG_CRYPTO_CRYPTD is not set 1750 + CONFIG_CRYPTO_AUTHENC=y 1751 + # CONFIG_CRYPTO_TEST is not set 1752 + 1753 + # 1754 + # Authenticated Encryption with Associated Data 1755 + # 1756 + # CONFIG_CRYPTO_CCM is not set 1757 + # CONFIG_CRYPTO_GCM is not set 1758 + # CONFIG_CRYPTO_SEQIV is not set 1759 + 1760 + # 1761 + # Block modes 1762 + # 1763 + CONFIG_CRYPTO_CBC=y 1764 + # CONFIG_CRYPTO_CTR is not set 1765 + # CONFIG_CRYPTO_CTS is not set 1766 + # CONFIG_CRYPTO_ECB is not set 1767 + # CONFIG_CRYPTO_LRW is not set 1768 + # CONFIG_CRYPTO_PCBC is not set 1769 + # CONFIG_CRYPTO_XTS is not set 1770 + 1771 + # 1772 + # Hash modes 1773 + # 1764 1774 CONFIG_CRYPTO_HMAC=y 1765 1775 # CONFIG_CRYPTO_XCBC is not set 1766 - # CONFIG_CRYPTO_NULL is not set 1776 + 1777 + # 1778 + # Digest 1779 + # 1780 + # CONFIG_CRYPTO_CRC32C is not set 1767 1781 CONFIG_CRYPTO_MD4=y 1768 1782 CONFIG_CRYPTO_MD5=y 1783 + # CONFIG_CRYPTO_MICHAEL_MIC is not set 1769 1784 CONFIG_CRYPTO_SHA1=y 1770 1785 CONFIG_CRYPTO_SHA256=y 1771 1786 CONFIG_CRYPTO_SHA512=y 1772 - # CONFIG_CRYPTO_WP512 is not set 1773 1787 # CONFIG_CRYPTO_TGR192 is not set 1774 - # CONFIG_CRYPTO_GF128MUL is not set 1775 - # CONFIG_CRYPTO_ECB is not set 1776 - CONFIG_CRYPTO_CBC=y 1777 - # CONFIG_CRYPTO_PCBC is not set 1778 - # CONFIG_CRYPTO_LRW is not set 1779 - # CONFIG_CRYPTO_XTS is not set 1780 - # CONFIG_CRYPTO_CTR is not set 1781 - # CONFIG_CRYPTO_GCM is not set 1782 - # CONFIG_CRYPTO_CCM is not set 1783 - # CONFIG_CRYPTO_CRYPTD is not set 1784 - CONFIG_CRYPTO_DES=y 1785 - # CONFIG_CRYPTO_FCRYPT is not set 1786 - CONFIG_CRYPTO_BLOWFISH=y 1787 - # CONFIG_CRYPTO_TWOFISH is not set 1788 - # CONFIG_CRYPTO_SERPENT is not set 1788 + # CONFIG_CRYPTO_WP512 is not set 1789 + 1790 + # 1791 + # Ciphers 1792 + # 1789 1793 CONFIG_CRYPTO_AES=y 1794 + # CONFIG_CRYPTO_ANUBIS is not set 1795 + # CONFIG_CRYPTO_ARC4 is not set 1796 + CONFIG_CRYPTO_BLOWFISH=y 1797 + # CONFIG_CRYPTO_CAMELLIA is not set 1790 1798 # CONFIG_CRYPTO_CAST5 is not set 1791 1799 # CONFIG_CRYPTO_CAST6 is not set 1792 - # CONFIG_CRYPTO_TEA is not set 1793 - # CONFIG_CRYPTO_ARC4 is not set 1800 + CONFIG_CRYPTO_DES=y 1801 + # CONFIG_CRYPTO_FCRYPT is not set 1794 1802 # CONFIG_CRYPTO_KHAZAD is not set 1795 - # CONFIG_CRYPTO_ANUBIS is not set 1796 - # CONFIG_CRYPTO_SEED is not set 1797 1803 # CONFIG_CRYPTO_SALSA20 is not set 1804 + # CONFIG_CRYPTO_SEED is not set 1805 + # CONFIG_CRYPTO_SERPENT is not set 1806 + # CONFIG_CRYPTO_TEA is not set 1807 + # CONFIG_CRYPTO_TWOFISH is not set 1808 + 1809 + # 1810 + # Compression 1811 + # 1798 1812 # CONFIG_CRYPTO_DEFLATE is not set 1799 - # CONFIG_CRYPTO_MICHAEL_MIC is not set 1800 - # CONFIG_CRYPTO_CRC32C is not set 1801 - # CONFIG_CRYPTO_CAMELLIA is not set 1802 - # CONFIG_CRYPTO_TEST is not set 1803 - CONFIG_CRYPTO_AUTHENC=y 1804 1813 # CONFIG_CRYPTO_LZO is not set 1805 1814 CONFIG_CRYPTO_HW=y 1806 1815 # CONFIG_CRYPTO_DEV_HIFN_795X is not set 1807 1816 # CONFIG_PPC_CLOCK is not set 1817 + # CONFIG_VIRTUALIZATION is not set
+2
arch/ppc/kernel/ppc_ksyms.c
··· 60 60 long long __ashldi3(long long, int); 61 61 long long __lshrdi3(long long, int); 62 62 63 + EXPORT_SYMBOL(empty_zero_page); 63 64 EXPORT_SYMBOL(clear_pages); 64 65 EXPORT_SYMBOL(clear_user_page); 66 + EXPORT_SYMBOL(copy_page); 65 67 EXPORT_SYMBOL(transfer_to_handler); 66 68 EXPORT_SYMBOL(do_IRQ); 67 69 EXPORT_SYMBOL(machine_check_exception);
+1
drivers/pcmcia/electra_cf.c
··· 352 352 }, 353 353 {}, 354 354 }; 355 + MODULE_DEVICE_TABLE(of, electra_cf_match); 355 356 356 357 static struct of_platform_driver electra_cf_driver = { 357 358 .name = (char *)driver_name,
+7 -5
include/asm-powerpc/io.h
··· 100 100 { \ 101 101 type ret; \ 102 102 __asm__ __volatile__("sync;" insn ";twi 0,%0,0;isync" \ 103 - : "=r" (ret) : "r" (addr), "m" (*addr)); \ 103 + : "=r" (ret) : "r" (addr), "m" (*addr) : "memory"); \ 104 104 return ret; \ 105 105 } 106 106 ··· 108 108 static inline void name(volatile type __iomem *addr, type val) \ 109 109 { \ 110 110 __asm__ __volatile__("sync;" insn \ 111 - : "=m" (*addr) : "r" (val), "r" (addr)); \ 112 - IO_SET_SYNC_FLAG(); \ 111 + : "=m" (*addr) : "r" (val), "r" (addr) : "memory"); \ 112 + IO_SET_SYNC_FLAG(); \ 113 113 } 114 114 115 115 ··· 333 333 " .long 3b,5b\n" \ 334 334 ".previous" \ 335 335 : "=&r" (x) \ 336 - : "r" (port + _IO_BASE)); \ 336 + : "r" (port + _IO_BASE) \ 337 + : "memory"); \ 337 338 return x; \ 338 339 } 339 340 ··· 351 350 " .long 0b,2b\n" \ 352 351 " .long 1b,2b\n" \ 353 352 ".previous" \ 354 - : : "r" (val), "r" (port + _IO_BASE)); \ 353 + : : "r" (val), "r" (port + _IO_BASE) \ 354 + : "memory"); \ 355 355 } 356 356 357 357 __do_in_asm(_rec_inb, "lbzx")