Commit f365ad5f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 61ac7bf5 9c8b28c2

arch/powerpc/boot/dts/mpc8610_hpcd.dts

+5 −5
Original line number Diff line number Diff line
@@ -251,14 +251,14 @@ 
		dma@c300 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "fsl,mpc8610-dma", "fsl,mpc8540-dma";

			compatible = "fsl,mpc8610-dma", "fsl,eloplus-dma";

			cell-index = <1>;

			reg = <0xc300 0x4>; /* DMA general status register */

			ranges = <0x0 0xc100 0x200>;



			dma-channel@0 {

				compatible = "fsl,mpc8610-dma-channel",

					"fsl,mpc8540-dma-channel";

					"fsl,eloplus-dma-channel";

				cell-index = <0>;

				reg = <0x0 0x80>;

				interrupt-parent = <&mpic>;
@@ -266,7 +266,7 @@ 
			};

			dma-channel@1 {

				compatible = "fsl,mpc8610-dma-channel",

					"fsl,mpc8540-dma-channel";

					"fsl,eloplus-dma-channel";

				cell-index = <1>;

				reg = <0x80 0x80>;

				interrupt-parent = <&mpic>;
@@ -274,7 +274,7 @@ 
			};

			dma-channel@2 {

				compatible = "fsl,mpc8610-dma-channel",

					"fsl,mpc8540-dma-channel";

					"fsl,eloplus-dma-channel";

				cell-index = <2>;

				reg = <0x100 0x80>;

				interrupt-parent = <&mpic>;
@@ -282,7 +282,7 @@ 
			};

			dma-channel@3 {

				compatible = "fsl,mpc8610-dma-channel",

					"fsl,mpc8540-dma-channel";

					"fsl,eloplus-dma-channel";

				cell-index = <3>;

				reg = <0x180 0x80>;

				interrupt-parent = <&mpic>;

arch/powerpc/configs/pasemi_defconfig

+111 −61
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.25-rc6

# Tue Mar 25 10:25:48 2008

# Linux kernel version: 2.6.26-rc3

# Tue May 27 16:08:06 2008

#

CONFIG_PPC64=y
@@ -29,6 +29,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y 
CONFIG_GENERIC_HARDIRQS=y

CONFIG_HAVE_SETUP_PER_CPU_AREA=y

CONFIG_IRQ_PER_CPU=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_TRACE_IRQFLAGS_SUPPORT=y

CONFIG_LOCKDEP_SUPPORT=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_ARCH_HAS_ILOG2_U32=y

CONFIG_ARCH_HAS_ILOG2_U64=y
@@ -87,6 +90,7 @@ CONFIG_INITRAMFS_SOURCE="" 
CONFIG_SYSCTL=y

# CONFIG_EMBEDDED is not set

CONFIG_SYSCTL_SYSCALL=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -115,12 +119,14 @@ CONFIG_HAVE_OPROFILE=y 
# CONFIG_KPROBES is not set

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

# CONFIG_HAVE_DMA_ATTRS is not set

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

CONFIG_MODULES=y

# CONFIG_MODULE_FORCE_LOAD is not set

CONFIG_MODULE_UNLOAD=y

# CONFIG_MODULE_FORCE_UNLOAD is not set

# CONFIG_MODVERSIONS is not set
@@ -167,11 +173,11 @@ CONFIG_PPC_PASEMI=y 
CONFIG_PPC_PASEMI_IOMMU=y

# CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set

CONFIG_PPC_PASEMI_MDIO=y

# CONFIG_PPC_CELLEB is not set

# CONFIG_PPC_PS3 is not set

# CONFIG_PPC_CELL is not set

# CONFIG_PPC_CELL_NATIVE is not set

# CONFIG_PPC_IBM_CELL_BLADE is not set

# CONFIG_PPC_CELLEB is not set

# CONFIG_PQ2ADS is not set

CONFIG_PPC_NATIVE=y

# CONFIG_IPIC is not set
@@ -192,6 +198,7 @@ CONFIG_CPU_FREQ_DEBUG=y 
CONFIG_CPU_FREQ_STAT=y

# CONFIG_CPU_FREQ_STAT_DETAILS is not set

CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set

# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set

# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set

# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
@@ -226,7 +233,6 @@ CONFIG_PREEMPT_NONE=y 
CONFIG_BINFMT_ELF=y

CONFIG_COMPAT_BINFMT_ELF=y

# CONFIG_BINFMT_MISC is not set

CONFIG_FORCE_MAX_ZONEORDER=9

CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y

CONFIG_IOMMU_VMERGE=y

CONFIG_IOMMU_HELPER=y
@@ -249,12 +255,14 @@ CONFIG_FLATMEM=y 
CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y

CONFIG_PAGEFLAGS_EXTENDED=y

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_RESOURCES_64BIT=y

CONFIG_ZONE_DMA_FLAG=1

CONFIG_BOUNCE=y

CONFIG_PPC_HAS_HASH_64K=y

CONFIG_PPC_64K_PAGES=y

CONFIG_FORCE_MAX_ZONEORDER=9

# CONFIG_PPC_SUBPAGE_PROT is not set

# CONFIG_SCHED_SMT is not set

CONFIG_PROC_DEVICETREE=y
@@ -290,9 +298,12 @@ CONFIG_CARDBUS=y 
# CONFIG_YENTA is not set

# CONFIG_PD6729 is not set

# CONFIG_I82092 is not set

# CONFIG_ELECTRA_CF is not set

CONFIG_ELECTRA_CF=y

# CONFIG_HOTPLUG_PCI is not set

# CONFIG_HAS_RAPIDIO is not set

CONFIG_PAGE_OFFSET=0xc000000000000000

CONFIG_KERNEL_START=0xc000000000000000

CONFIG_PHYSICAL_START=0x00000000



#

# Networking
@@ -341,8 +352,6 @@ CONFIG_TCP_CONG_CUBIC=y 
CONFIG_DEFAULT_TCP_CONG="cubic"

# CONFIG_TCP_MD5SIG is not set

# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

# CONFIG_NETWORK_SECMARK is not set

# CONFIG_NETFILTER is not set

# CONFIG_IP_DCCP is not set
@@ -473,6 +482,7 @@ CONFIG_MTD_NAND_PASEMI=y 
#

# CONFIG_MTD_UBI is not set

CONFIG_OF_DEVICE=y

CONFIG_OF_I2C=y

# CONFIG_PARPORT is not set

CONFIG_BLK_DEV=y

# CONFIG_BLK_DEV_FD is not set
@@ -520,7 +530,6 @@ CONFIG_IDE_PROC_FS=y 
#

# IDE chipset support/bugfixes

#

# CONFIG_IDE_GENERIC is not set

# CONFIG_BLK_DEV_PLATFORM is not set



#
@@ -554,7 +563,7 @@ CONFIG_IDE_PROC_FS=y 
# CONFIG_BLK_DEV_VIA82CXXX is not set

# CONFIG_BLK_DEV_TC86C001 is not set

# CONFIG_BLK_DEV_IDEDMA is not set

CONFIG_IDE_ARCH_OBSOLETE_INIT=y

# CONFIG_BLK_DEV_HD_ONLY is not set

# CONFIG_BLK_DEV_HD is not set



#
@@ -632,7 +641,10 @@ CONFIG_SCSI_LOWLEVEL=y 
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set

CONFIG_ATA=y

# CONFIG_ATA_NONSTANDARD is not set

CONFIG_SATA_PMP=y

# CONFIG_SATA_AHCI is not set

CONFIG_SATA_SIL24=y

CONFIG_ATA_SFF=y

# CONFIG_SATA_SVW is not set

# CONFIG_ATA_PIIX is not set

CONFIG_SATA_MV=y
@@ -642,7 +654,6 @@ CONFIG_SATA_MV=y 
# CONFIG_SATA_PROMISE is not set

# CONFIG_SATA_SX4 is not set

# CONFIG_SATA_SIL is not set

CONFIG_SATA_SIL24=y

# CONFIG_SATA_SIS is not set

# CONFIG_SATA_ULI is not set

# CONFIG_SATA_VIA is not set
@@ -689,6 +700,7 @@ CONFIG_PATA_PCMCIA=y 
# CONFIG_PATA_WINBOND is not set

CONFIG_PATA_PLATFORM=y

CONFIG_PATA_OF_PLATFORM=y

# CONFIG_PATA_SCH is not set

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

CONFIG_MD_LINEAR=y
@@ -791,7 +803,6 @@ CONFIG_E1000_NAPI=y 
# CONFIG_SIS190 is not set

# CONFIG_SKGE is not set

# CONFIG_SKY2 is not set

# CONFIG_SK98LIN is not set

# CONFIG_VIA_VELOCITY is not set

CONFIG_TIGON3=y

# CONFIG_BNX2 is not set
@@ -810,6 +821,7 @@ CONFIG_PASEMI_MAC=y 
# CONFIG_MLX4_CORE is not set

# CONFIG_TEHUTI is not set

# CONFIG_BNX2X is not set

# CONFIG_SFC is not set

# CONFIG_TR is not set



#
@@ -817,6 +829,7 @@ CONFIG_PASEMI_MAC=y 
#

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_IWLWIFI_LEDS is not set



#

# USB Network Adapters
@@ -890,6 +903,7 @@ CONFIG_VT=y 
CONFIG_VT_CONSOLE=y

CONFIG_HW_CONSOLE=y

# CONFIG_VT_HW_CONSOLE_BINDING is not set

CONFIG_DEVKMEM=y

# CONFIG_SERIAL_NONSTANDARD is not set

# CONFIG_NOZOMI is not set
@@ -917,7 +931,6 @@ CONFIG_LEGACY_PTY_COUNT=4 
# CONFIG_IPMI_HANDLER is not set

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_PASEMI=y

# CONFIG_GEN_RTC is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set
@@ -936,13 +949,7 @@ CONFIG_DEVPORT=y 
CONFIG_I2C=y

CONFIG_I2C_BOARDINFO=y

CONFIG_I2C_CHARDEV=y



#

# I2C Algorithms

#

CONFIG_I2C_ALGOBIT=y

CONFIG_I2C_ALGOPCF=y

CONFIG_I2C_ALGOPCA=y



#

# I2C Hardware Bus support
@@ -971,6 +978,7 @@ CONFIG_I2C_PASEMI=y 
# CONFIG_I2C_VIA is not set

# CONFIG_I2C_VIAPRO is not set

# CONFIG_I2C_VOODOO3 is not set

# CONFIG_I2C_PCA_PLATFORM is not set



#

# Miscellaneous I2C Chip support
@@ -980,19 +988,13 @@ CONFIG_SENSORS_EEPROM=y 
# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_TPS65010 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set



#

# SPI support

#

# CONFIG_SPI is not set

# CONFIG_SPI_MASTER is not set

# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set

CONFIG_HWMON=y
@@ -1062,12 +1064,22 @@ CONFIG_SSB_POSSIBLE=y 
# Multifunction device drivers

#

# CONFIG_MFD_SM501 is not set

# CONFIG_HTC_PASIC3 is not set



#

# Multimedia devices

#



#

# Multimedia core support

#

# CONFIG_VIDEO_DEV is not set

# CONFIG_DVB_CORE is not set

# CONFIG_VIDEO_MEDIA is not set



#

# Multimedia drivers

#

CONFIG_DAB=y

# CONFIG_USB_DABUSB is not set
@@ -1094,8 +1106,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y 
# CONFIG_FB_SYS_FILLRECT is not set

# CONFIG_FB_SYS_COPYAREA is not set

# CONFIG_FB_SYS_IMAGEBLIT is not set

# CONFIG_FB_FOREIGN_ENDIAN is not set

# CONFIG_FB_SYS_FOPS is not set

CONFIG_FB_DEFERRED_IO=y

# CONFIG_FB_SVGALIB is not set

CONFIG_FB_MACMODES=y

CONFIG_FB_BACKLIGHT=y
@@ -1213,6 +1225,7 @@ CONFIG_SND_VERBOSE_PROCFS=y 
# CONFIG_SND_AU8810 is not set

# CONFIG_SND_AU8820 is not set

# CONFIG_SND_AU8830 is not set

# CONFIG_SND_AW2 is not set

# CONFIG_SND_AZT3328 is not set

# CONFIG_SND_BT87X is not set

# CONFIG_SND_CA0106 is not set
@@ -1292,11 +1305,11 @@ CONFIG_SND_USB_USX2Y=y 
# CONFIG_SND_SOC is not set



#

# SoC Audio support for SuperH

# ALSA SoC audio for Freescale SOCs

#



#

# ALSA SoC audio for Freescale SOCs

# SoC Audio for the Texas Instruments OMAP

#



#
@@ -1334,11 +1347,13 @@ CONFIG_USB_DEVICEFS=y 
#

# USB Host Controller Drivers

#

# CONFIG_USB_C67X00_HCD is not set

CONFIG_USB_EHCI_HCD=y

# CONFIG_USB_EHCI_ROOT_HUB_TT is not set

# CONFIG_USB_EHCI_TT_NEWSCHED is not set

CONFIG_USB_EHCI_HCD_PPC_OF=y

# CONFIG_USB_ISP116X_HCD is not set

# CONFIG_USB_ISP1760_HCD is not set

CONFIG_USB_OHCI_HCD=y

# CONFIG_USB_OHCI_HCD_PPC_OF is not set

# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -1354,6 +1369,7 @@ CONFIG_USB_SL811_HCD=y 
#

# CONFIG_USB_ACM is not set

# CONFIG_USB_PRINTER is not set

# CONFIG_USB_WDM is not set



#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1375,6 +1391,7 @@ CONFIG_USB_STORAGE=y 
# CONFIG_USB_STORAGE_ALAUDA is not set

# CONFIG_USB_STORAGE_ONETOUCH is not set

# CONFIG_USB_STORAGE_KARMA is not set

# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set

CONFIG_USB_LIBUSUAL=y



#
@@ -1416,6 +1433,7 @@ CONFIG_USB_LIBUSUAL=y 
# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set

# CONFIG_NEW_LEDS is not set

# CONFIG_ACCESSIBILITY is not set

# CONFIG_INFINIBAND is not set

CONFIG_EDAC=y
@@ -1475,10 +1493,6 @@ CONFIG_RTC_DRV_DS1307=y 
# on-CPU RTC drivers

#

# CONFIG_DMADEVICES is not set



#

# Userspace I/O

#

# CONFIG_UIO is not set



#
@@ -1576,12 +1590,10 @@ CONFIG_NFS_FS=y 
CONFIG_NFS_V3=y

# CONFIG_NFS_V3_ACL is not set

# CONFIG_NFS_V4 is not set

# CONFIG_NFS_DIRECTIO is not set

CONFIG_NFSD=y

CONFIG_NFSD_V3=y

# CONFIG_NFSD_V3_ACL is not set

CONFIG_NFSD_V4=y

CONFIG_NFSD_TCP=y

CONFIG_ROOT_NFS=y

CONFIG_LOCKD=y

CONFIG_LOCKD_V4=y
@@ -1665,9 +1677,10 @@ CONFIG_NLS_ISO8859_1=y 
# Library routines

#

CONFIG_BITREVERSE=y

# CONFIG_GENERIC_FIND_FIRST_BIT is not set

CONFIG_CRC_CCITT=y

# CONFIG_CRC16 is not set

# CONFIG_CRC_ITU_T is not set

CONFIG_CRC_ITU_T=y

CONFIG_CRC32=y

# CONFIG_CRC7 is not set

CONFIG_LIBCRC32C=m
@@ -1677,6 +1690,7 @@ CONFIG_PLIST=y 
CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

CONFIG_HAVE_LMB=y



#

# Kernel hacking
@@ -1684,6 +1698,7 @@ CONFIG_HAS_DMA=y 
# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_WARN_DEPRECATED=y

CONFIG_ENABLE_MUST_CHECK=y

CONFIG_FRAME_WARN=2048

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set

# CONFIG_DEBUG_FS is not set
@@ -1694,18 +1709,23 @@ CONFIG_DETECT_SOFTLOCKUP=y 
# CONFIG_SCHED_DEBUG is not set

# CONFIG_SCHEDSTATS is not set

# CONFIG_TIMER_STATS is not set

# CONFIG_DEBUG_OBJECTS is not set

# CONFIG_SLUB_DEBUG_ON is not set

# CONFIG_SLUB_STATS is not set

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_MUTEXES is not set

# CONFIG_DEBUG_LOCK_ALLOC is not set

# CONFIG_PROVE_LOCKING is not set

# CONFIG_LOCK_STAT is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_WRITECOUNT is not set

# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

# CONFIG_BOOT_PRINTK_DELAY is not set
@@ -1735,53 +1755,83 @@ CONFIG_ASYNC_CORE=y 
CONFIG_ASYNC_MEMCPY=y

CONFIG_ASYNC_XOR=y

CONFIG_CRYPTO=y



#

# Crypto core or helper

#

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_AEAD=y

CONFIG_CRYPTO_BLKCIPHER=y

# CONFIG_CRYPTO_SEQIV is not set

CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_MANAGER=y

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_CRYPTD is not set

CONFIG_CRYPTO_AUTHENC=y

# CONFIG_CRYPTO_TEST is not set



#

# Authenticated Encryption with Associated Data

#

# CONFIG_CRYPTO_CCM is not set

# CONFIG_CRYPTO_GCM is not set

# CONFIG_CRYPTO_SEQIV is not set



#

# Block modes

#

CONFIG_CRYPTO_CBC=y

# CONFIG_CRYPTO_CTR is not set

# CONFIG_CRYPTO_CTS is not set

# CONFIG_CRYPTO_ECB is not set

# CONFIG_CRYPTO_LRW is not set

# CONFIG_CRYPTO_PCBC is not set

# CONFIG_CRYPTO_XTS is not set



#

# Hash modes

#

CONFIG_CRYPTO_HMAC=y

# CONFIG_CRYPTO_XCBC is not set

# CONFIG_CRYPTO_NULL is not set



#

# Digest

#

# CONFIG_CRYPTO_CRC32C is not set

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_MD5=y

# CONFIG_CRYPTO_MICHAEL_MIC is not set

CONFIG_CRYPTO_SHA1=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_SHA512=y

# CONFIG_CRYPTO_WP512 is not set

# CONFIG_CRYPTO_TGR192 is not set

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_ECB is not set

CONFIG_CRYPTO_CBC=y

# CONFIG_CRYPTO_PCBC is not set

# CONFIG_CRYPTO_LRW is not set

# CONFIG_CRYPTO_XTS is not set

# CONFIG_CRYPTO_CTR is not set

# CONFIG_CRYPTO_GCM is not set

# CONFIG_CRYPTO_CCM is not set

# CONFIG_CRYPTO_CRYPTD is not set

CONFIG_CRYPTO_DES=y

# CONFIG_CRYPTO_FCRYPT is not set

CONFIG_CRYPTO_BLOWFISH=y

# CONFIG_CRYPTO_TWOFISH is not set

# CONFIG_CRYPTO_SERPENT is not set

# CONFIG_CRYPTO_WP512 is not set



#

# Ciphers

#

CONFIG_CRYPTO_AES=y

# CONFIG_CRYPTO_ANUBIS is not set

# CONFIG_CRYPTO_ARC4 is not set

CONFIG_CRYPTO_BLOWFISH=y

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_CAST5 is not set

# CONFIG_CRYPTO_CAST6 is not set

# CONFIG_CRYPTO_TEA is not set

# CONFIG_CRYPTO_ARC4 is not set

CONFIG_CRYPTO_DES=y

# CONFIG_CRYPTO_FCRYPT is not set

# CONFIG_CRYPTO_KHAZAD is not set

# CONFIG_CRYPTO_ANUBIS is not set

# CONFIG_CRYPTO_SEED is not set

# CONFIG_CRYPTO_SALSA20 is not set

# CONFIG_CRYPTO_SEED is not set

# CONFIG_CRYPTO_SERPENT is not set

# CONFIG_CRYPTO_TEA is not set

# CONFIG_CRYPTO_TWOFISH is not set



#

# Compression

#

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_MICHAEL_MIC is not set

# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_TEST is not set

CONFIG_CRYPTO_AUTHENC=y

# CONFIG_CRYPTO_LZO is not set

CONFIG_CRYPTO_HW=y

# CONFIG_CRYPTO_DEV_HIFN_795X is not set

# CONFIG_PPC_CLOCK is not set

# CONFIG_VIRTUALIZATION is not set

arch/ppc/kernel/ppc_ksyms.c

+2 −0
Original line number Diff line number Diff line
@@ -60,8 +60,10 @@ long long __ashrdi3(long long, int); 
long long __ashldi3(long long, int);

long long __lshrdi3(long long, int);



EXPORT_SYMBOL(empty_zero_page);

EXPORT_SYMBOL(clear_pages);

EXPORT_SYMBOL(clear_user_page);

EXPORT_SYMBOL(copy_page);

EXPORT_SYMBOL(transfer_to_handler);

EXPORT_SYMBOL(do_IRQ);

EXPORT_SYMBOL(machine_check_exception);

drivers/pcmcia/electra_cf.c

+1 −0
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ static struct of_device_id electra_cf_match[] = { 
	},

	{},

};

MODULE_DEVICE_TABLE(of, electra_cf_match);



static struct of_platform_driver electra_cf_driver = {

	.name	   = (char *)driver_name,

include/asm-powerpc/io.h

+7 −5
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static inline type name(const volatile type __iomem *addr) \ 
{									\

	type ret;							\

	__asm__ __volatile__("sync;" insn ";twi 0,%0,0;isync"		\

 		: "=r" (ret) : "r" (addr), "m" (*addr));		\

		: "=r" (ret) : "r" (addr), "m" (*addr) : "memory");	\

	return ret;							\

}
@@ -108,7 +108,7 @@ static inline type name(const volatile type __iomem *addr) \ 
static inline void name(volatile type __iomem *addr, type val)		\

{									\

	__asm__ __volatile__("sync;" insn				\

 		: "=m" (*addr) : "r" (val), "r" (addr));		\

		: "=m" (*addr) : "r" (val), "r" (addr) : "memory");	\

	IO_SET_SYNC_FLAG();						\

}
@@ -333,7 +333,8 @@ static inline unsigned int name(unsigned int port) \ 
		"	.long	3b,5b\n"		\

		".previous"				\

		: "=&r" (x)				\

		: "r" (port + _IO_BASE));		\

		: "r" (port + _IO_BASE)			\

		: "memory");  				\

	return x;					\

}
@@ -350,7 +351,8 @@ static inline void name(unsigned int val, unsigned int port) \ 
		"	.long	0b,2b\n"		\

		"	.long	1b,2b\n"		\

		".previous"				\

		: : "r" (val), "r" (port + _IO_BASE));	\

		: : "r" (val), "r" (port + _IO_BASE)	\

		: "memory");   	   	   		\

}



__do_in_asm(_rec_inb, "lbzx")

CRA Git | Maintained and supported by SUSTech CRA and CCSE