Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (7cece14a) · Commits · e / devices / android_kernel_teracube_mt6765

arch/sparc/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -68,6 +68,7 @@ config SPARC
	default y		default y
	select HAVE_IDE		select HAVE_IDE
	select HAVE_OPROFILE		select HAVE_OPROFILE
			select HAVE_ARCH_KGDB if !SMP

	# Identify this as a Sparc32 build		# Identify this as a Sparc32 build
	config SPARC32		config SPARC32

arch/sparc/defconfig

+77 −62

Original line number	Original line	Diff line number	Diff line
	#		#
	# Automatically generated make config: don't edit		# Automatically generated make config: don't edit
	# Linux kernel version: 2.6.25		# Linux kernel version: 2.6.25
	# Sun Apr 20 01:49:51 2008		# Tue Apr 29 01:28:58 2008
	#		#
	CONFIG_MMU=y		CONFIG_MMU=y
	CONFIG_HIGHMEM=y		CONFIG_HIGHMEM=y
	@@ -217,12 +217,7 @@ CONFIG_IPV6_TUNNEL=m
	# CONFIG_NETWORK_SECMARK is not set		# CONFIG_NETWORK_SECMARK is not set
	# CONFIG_NETFILTER is not set		# CONFIG_NETFILTER is not set
	# CONFIG_IP_DCCP is not set		# CONFIG_IP_DCCP is not set
	CONFIG_IP_SCTP=m		# CONFIG_IP_SCTP is not set
	# CONFIG_SCTP_DBG_MSG is not set
	CONFIG_SCTP_DBG_OBJCNT=y
	# CONFIG_SCTP_HMAC_NONE is not set
	# CONFIG_SCTP_HMAC_SHA1 is not set
	CONFIG_SCTP_HMAC_MD5=y
	# CONFIG_TIPC is not set		# CONFIG_TIPC is not set
	# CONFIG_ATM is not set		# CONFIG_ATM is not set
	# CONFIG_BRIDGE is not set		# CONFIG_BRIDGE is not set
	@@ -245,9 +240,7 @@ CONFIG_NET_PKTGEN=m
	# CONFIG_CAN is not set		# CONFIG_CAN is not set
	# CONFIG_IRDA is not set		# CONFIG_IRDA is not set
	# CONFIG_BT is not set		# CONFIG_BT is not set
	CONFIG_AF_RXRPC=m		# CONFIG_AF_RXRPC is not set
	# CONFIG_AF_RXRPC_DEBUG is not set
	# CONFIG_RXKAD is not set

	#		#
	# Wireless		# Wireless
	@@ -390,7 +383,7 @@ CONFIG_DUMMY=m
	# CONFIG_BONDING is not set		# CONFIG_BONDING is not set
	# CONFIG_MACVLAN is not set		# CONFIG_MACVLAN is not set
	# CONFIG_EQUALIZER is not set		# CONFIG_EQUALIZER is not set
	CONFIG_TUN=m		# CONFIG_TUN is not set
	# CONFIG_VETH is not set		# CONFIG_VETH is not set
	# CONFIG_ARCNET is not set		# CONFIG_ARCNET is not set
	# CONFIG_PHYLIB is not set		# CONFIG_PHYLIB is not set
	@@ -544,6 +537,7 @@ CONFIG_SERIAL_SUNSU_CONSOLE=y
	# CONFIG_SERIAL_SUNSAB is not set		# CONFIG_SERIAL_SUNSAB is not set
	CONFIG_SERIAL_CORE=y		CONFIG_SERIAL_CORE=y
	CONFIG_SERIAL_CORE_CONSOLE=y		CONFIG_SERIAL_CORE_CONSOLE=y
			CONFIG_CONSOLE_POLL=y
	# CONFIG_SERIAL_JSM is not set		# CONFIG_SERIAL_JSM is not set
	CONFIG_UNIX98_PTYS=y		CONFIG_UNIX98_PTYS=y
	CONFIG_LEGACY_PTYS=y		CONFIG_LEGACY_PTYS=y
	@@ -595,6 +589,7 @@ CONFIG_SSB_POSSIBLE=y
	# Multifunction device drivers		# Multifunction device drivers
	#		#
	# CONFIG_MFD_SM501 is not set		# CONFIG_MFD_SM501 is not set
			# CONFIG_HTC_PASIC3 is not set

	#		#
	# Multimedia devices		# Multimedia devices
	@@ -645,10 +640,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
	# CONFIG_NEW_LEDS is not set		# CONFIG_NEW_LEDS is not set
	# CONFIG_INFINIBAND is not set		# CONFIG_INFINIBAND is not set
	# CONFIG_RTC_CLASS is not set		# CONFIG_RTC_CLASS is not set

	#
	# Userspace I/O
	#
	# CONFIG_UIO is not set		# CONFIG_UIO is not set

	#		#
	@@ -680,16 +671,12 @@ CONFIG_FS_MBCACHE=y
	# CONFIG_REISERFS_FS is not set		# CONFIG_REISERFS_FS is not set
	# CONFIG_JFS_FS is not set		# CONFIG_JFS_FS is not set
	CONFIG_FS_POSIX_ACL=y		CONFIG_FS_POSIX_ACL=y
	CONFIG_XFS_FS=m		# CONFIG_XFS_FS is not set
	CONFIG_XFS_QUOTA=y
	CONFIG_XFS_POSIX_ACL=y
	CONFIG_XFS_RT=y
	# CONFIG_OCFS2_FS is not set		# CONFIG_OCFS2_FS is not set
	CONFIG_DNOTIFY=y		CONFIG_DNOTIFY=y
	CONFIG_INOTIFY=y		CONFIG_INOTIFY=y
	CONFIG_INOTIFY_USER=y		CONFIG_INOTIFY_USER=y
	# CONFIG_QUOTA is not set		# CONFIG_QUOTA is not set
	CONFIG_QUOTACTL=y
	CONFIG_AUTOFS_FS=m		CONFIG_AUTOFS_FS=m
	CONFIG_AUTOFS4_FS=m		CONFIG_AUTOFS4_FS=m
	# CONFIG_FUSE_FS is not set		# CONFIG_FUSE_FS is not set
	@@ -725,11 +712,9 @@ CONFIG_SYSFS=y
	#		#
	# CONFIG_ADFS_FS is not set		# CONFIG_ADFS_FS is not set
	# CONFIG_AFFS_FS is not set		# CONFIG_AFFS_FS is not set
	# CONFIG_ECRYPT_FS is not set
	# CONFIG_HFS_FS is not set		# CONFIG_HFS_FS is not set
	# CONFIG_HFSPLUS_FS is not set		# CONFIG_HFSPLUS_FS is not set
	CONFIG_BEFS_FS=m		# CONFIG_BEFS_FS is not set
	# CONFIG_BEFS_DEBUG is not set
	# CONFIG_BFS_FS is not set		# CONFIG_BFS_FS is not set
	# CONFIG_EFS_FS is not set		# CONFIG_EFS_FS is not set
	# CONFIG_CRAMFS is not set		# CONFIG_CRAMFS is not set
	@@ -744,7 +729,6 @@ CONFIG_NETWORK_FILESYSTEMS=y
	CONFIG_NFS_FS=y		CONFIG_NFS_FS=y
	# CONFIG_NFS_V3 is not set		# CONFIG_NFS_V3 is not set
	# CONFIG_NFS_V4 is not set		# CONFIG_NFS_V4 is not set
	# CONFIG_NFS_DIRECTIO is not set
	# CONFIG_NFSD is not set		# CONFIG_NFSD is not set
	CONFIG_ROOT_NFS=y		CONFIG_ROOT_NFS=y
	CONFIG_LOCKD=y		CONFIG_LOCKD=y
	@@ -755,16 +739,10 @@ CONFIG_SUNRPC_GSS=m
	CONFIG_RPCSEC_GSS_KRB5=m		CONFIG_RPCSEC_GSS_KRB5=m
	# CONFIG_RPCSEC_GSS_SPKM3 is not set		# CONFIG_RPCSEC_GSS_SPKM3 is not set
	# CONFIG_SMB_FS is not set		# CONFIG_SMB_FS is not set
	CONFIG_CIFS=m		# CONFIG_CIFS is not set
	# CONFIG_CIFS_STATS is not set
	# CONFIG_CIFS_WEAK_PW_HASH is not set
	# CONFIG_CIFS_XATTR is not set
	# CONFIG_CIFS_DEBUG2 is not set
	# CONFIG_CIFS_EXPERIMENTAL is not set
	# CONFIG_NCP_FS is not set		# CONFIG_NCP_FS is not set
	# CONFIG_CODA_FS is not set		# CONFIG_CODA_FS is not set
	CONFIG_AFS_FS=m		# CONFIG_AFS_FS is not set
	# CONFIG_AFS_DEBUG is not set

	#		#
	# Partition Types		# Partition Types
	@@ -821,6 +799,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
	# CONFIG_PRINTK_TIME is not set		# CONFIG_PRINTK_TIME is not set
	# CONFIG_ENABLE_WARN_DEPRECATED is not set		# CONFIG_ENABLE_WARN_DEPRECATED is not set
	CONFIG_ENABLE_MUST_CHECK=y		CONFIG_ENABLE_MUST_CHECK=y
			CONFIG_FRAME_WARN=1024
	CONFIG_MAGIC_SYSRQ=y		CONFIG_MAGIC_SYSRQ=y
	# CONFIG_UNUSED_SYMBOLS is not set		# CONFIG_UNUSED_SYMBOLS is not set
	# CONFIG_DEBUG_FS is not set		# CONFIG_DEBUG_FS is not set
	@@ -842,70 +821,105 @@ CONFIG_DETECT_SOFTLOCKUP=y
	CONFIG_DEBUG_BUGVERBOSE=y		CONFIG_DEBUG_BUGVERBOSE=y
	# CONFIG_DEBUG_INFO is not set		# CONFIG_DEBUG_INFO is not set
	# CONFIG_DEBUG_VM is not set		# CONFIG_DEBUG_VM is not set
			# CONFIG_DEBUG_WRITECOUNT is not set
	# CONFIG_DEBUG_LIST is not set		# CONFIG_DEBUG_LIST is not set
	# CONFIG_DEBUG_SG is not set		# CONFIG_DEBUG_SG is not set
			CONFIG_FRAME_POINTER=y
	# CONFIG_BOOT_PRINTK_DELAY is not set		# CONFIG_BOOT_PRINTK_DELAY is not set
	# CONFIG_RCU_TORTURE_TEST is not set		# CONFIG_RCU_TORTURE_TEST is not set
	# CONFIG_BACKTRACE_SELF_TEST is not set		# CONFIG_BACKTRACE_SELF_TEST is not set
	# CONFIG_FAULT_INJECTION is not set		# CONFIG_FAULT_INJECTION is not set
	# CONFIG_SAMPLES is not set		# CONFIG_SAMPLES is not set
			CONFIG_KGDB=y
			CONFIG_HAVE_ARCH_KGDB=y
			CONFIG_KGDB_SERIAL_CONSOLE=y
			CONFIG_KGDB_TESTS=y
			# CONFIG_KGDB_TESTS_ON_BOOT is not set
	# CONFIG_DEBUG_STACK_USAGE is not set		# CONFIG_DEBUG_STACK_USAGE is not set

	#		#
	# Security options		# Security options
	#		#
	CONFIG_KEYS=y		# CONFIG_KEYS is not set
	# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
	# CONFIG_SECURITY is not set		# CONFIG_SECURITY is not set
	# CONFIG_SECURITY_FILE_CAPABILITIES is not set		# CONFIG_SECURITY_FILE_CAPABILITIES is not set
	CONFIG_CRYPTO=y		CONFIG_CRYPTO=y

			#
			# Crypto core or helper
			#
	CONFIG_CRYPTO_ALGAPI=y		CONFIG_CRYPTO_ALGAPI=y
	CONFIG_CRYPTO_AEAD=y		CONFIG_CRYPTO_AEAD=y
	CONFIG_CRYPTO_BLKCIPHER=y		CONFIG_CRYPTO_BLKCIPHER=y
	# CONFIG_CRYPTO_SEQIV is not set
	CONFIG_CRYPTO_HASH=y		CONFIG_CRYPTO_HASH=y
	CONFIG_CRYPTO_MANAGER=y		CONFIG_CRYPTO_MANAGER=y
			# CONFIG_CRYPTO_GF128MUL is not set
			CONFIG_CRYPTO_NULL=m
			# 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=m
			# CONFIG_CRYPTO_LRW is not set
			CONFIG_CRYPTO_PCBC=m
			# CONFIG_CRYPTO_XTS is not set

			#
			# Hash modes
			#
	CONFIG_CRYPTO_HMAC=y		CONFIG_CRYPTO_HMAC=y
	# CONFIG_CRYPTO_XCBC is not set		# CONFIG_CRYPTO_XCBC is not set
	CONFIG_CRYPTO_NULL=m
			#
			# Digest
			#
			CONFIG_CRYPTO_CRC32C=m
	CONFIG_CRYPTO_MD4=y		CONFIG_CRYPTO_MD4=y
	CONFIG_CRYPTO_MD5=y		CONFIG_CRYPTO_MD5=y
			CONFIG_CRYPTO_MICHAEL_MIC=m
	CONFIG_CRYPTO_SHA1=y		CONFIG_CRYPTO_SHA1=y
	CONFIG_CRYPTO_SHA256=m		CONFIG_CRYPTO_SHA256=m
	CONFIG_CRYPTO_SHA512=m		CONFIG_CRYPTO_SHA512=m
	# CONFIG_CRYPTO_WP512 is not set
	# CONFIG_CRYPTO_TGR192 is not set		# CONFIG_CRYPTO_TGR192 is not set
	# CONFIG_CRYPTO_GF128MUL is not set		# CONFIG_CRYPTO_WP512 is not set
	CONFIG_CRYPTO_ECB=m
	CONFIG_CRYPTO_CBC=y		#
	CONFIG_CRYPTO_PCBC=m		# Ciphers
	# 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=m
	CONFIG_CRYPTO_TWOFISH=m
	CONFIG_CRYPTO_TWOFISH_COMMON=m
	CONFIG_CRYPTO_SERPENT=m
	CONFIG_CRYPTO_AES=m		CONFIG_CRYPTO_AES=m
			# CONFIG_CRYPTO_ANUBIS is not set
			CONFIG_CRYPTO_ARC4=m
			CONFIG_CRYPTO_BLOWFISH=m
			# CONFIG_CRYPTO_CAMELLIA is not set
	CONFIG_CRYPTO_CAST5=m		CONFIG_CRYPTO_CAST5=m
	CONFIG_CRYPTO_CAST6=m		CONFIG_CRYPTO_CAST6=m
	# CONFIG_CRYPTO_TEA is not set		CONFIG_CRYPTO_DES=y
	CONFIG_CRYPTO_ARC4=m		# CONFIG_CRYPTO_FCRYPT is not set
	# CONFIG_CRYPTO_KHAZAD 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_SALSA20 is not set
			# CONFIG_CRYPTO_SEED is not set
			CONFIG_CRYPTO_SERPENT=m
			# CONFIG_CRYPTO_TEA is not set
			CONFIG_CRYPTO_TWOFISH=m
			CONFIG_CRYPTO_TWOFISH_COMMON=m

			#
			# Compression
			#
	CONFIG_CRYPTO_DEFLATE=y		CONFIG_CRYPTO_DEFLATE=y
	CONFIG_CRYPTO_MICHAEL_MIC=m
	CONFIG_CRYPTO_CRC32C=m
	# CONFIG_CRYPTO_CAMELLIA is not set
	# CONFIG_CRYPTO_TEST is not set
	CONFIG_CRYPTO_AUTHENC=y
	# CONFIG_CRYPTO_LZO is not set		# CONFIG_CRYPTO_LZO is not set
	# CONFIG_CRYPTO_HW is not set		# CONFIG_CRYPTO_HW is not set

	@@ -913,6 +927,7 @@ CONFIG_CRYPTO_AUTHENC=y
	# Library routines		# Library routines
	#		#
	CONFIG_BITREVERSE=y		CONFIG_BITREVERSE=y
			# CONFIG_GENERIC_FIND_FIRST_BIT is not set
	# CONFIG_CRC_CCITT is not set		# CONFIG_CRC_CCITT is not set
	# CONFIG_CRC16 is not set		# CONFIG_CRC16 is not set
	# CONFIG_CRC_ITU_T is not set		# CONFIG_CRC_ITU_T is not set

arch/sparc/kernel/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,3 +25,4 @@ obj-$(CONFIG_PCI) += ebus.o
	obj-$(CONFIG_SUN_PM) += apc.o pmc.o		obj-$(CONFIG_SUN_PM) += apc.o pmc.o
	obj-$(CONFIG_MODULES) += module.o sparc_ksyms.o		obj-$(CONFIG_MODULES) += module.o sparc_ksyms.o
	obj-$(CONFIG_SPARC_LED) += led.o		obj-$(CONFIG_SPARC_LED) += led.o
			obj-$(CONFIG_KGDB) += kgdb.o

arch/sparc/kernel/entry.S

+44 −81

Original line number	Original line	Diff line number	Diff line
	@@ -12,7 +12,6 @@
	#include <asm/head.h>		#include <asm/head.h>
	#include <asm/asi.h>		#include <asm/asi.h>
	#include <asm/smp.h>		#include <asm/smp.h>
	#include <asm/kgdb.h>
	#include <asm/contregs.h>		#include <asm/contregs.h>
	#include <asm/ptrace.h>		#include <asm/ptrace.h>
	#include <asm/asm-offsets.h>		#include <asm/asm-offsets.h>
	@@ -45,91 +44,20 @@
	_SV; _SV; _SV; _SV; _SV; _SV; _SV; \		_SV; _SV; _SV; _SV; _SV; _SV; _SV; \
	_RS; _RS; _RS; _RS; _RS; _RS; _RS;		_RS; _RS; _RS; _RS; _RS; _RS; _RS;

	/* First, KGDB low level things. This is a rewrite
	* of the routines found in the sparc-stub.c asm() statement
	* from the gdb distribution. This is also dual-purpose
	* as a software trap for userlevel programs.
	*/
	.data
	.align 4

	in_trap_handler:
	.word 0

	.text		.text
	.align 4

	#if 0 /* kgdb is dropped from 2.5.33 */		#ifdef CONFIG_KGDB
	! This function is called when any SPARC trap (except window overflow or		.align 4
	! underflow) occurs. It makes sure that the invalid register window is still		.globl arch_kgdb_breakpoint
	! available before jumping into C code. It will also restore the world if you		.type arch_kgdb_breakpoint,#function
	! return from handle_exception.		arch_kgdb_breakpoint:
			ta 0x7d
	.globl trap_low		retl
	trap_low:		nop
	rd %wim, %l3		.size arch_kgdb_breakpoint,.-arch_kgdb_breakpoint
	SAVE_ALL

	sethi %hi(in_trap_handler), %l4
	ld [%lo(in_trap_handler) + %l4], %l5
	inc %l5
	st %l5, [%lo(in_trap_handler) + %l4]

	/* Make sure kgdb sees the same state we just saved. */
	LOAD_PT_GLOBALS(sp)
	LOAD_PT_INS(sp)
	ld [%sp + STACKFRAME_SZ + PT_Y], %l4
	ld [%sp + STACKFRAME_SZ + PT_WIM], %l3
	ld [%sp + STACKFRAME_SZ + PT_PSR], %l0
	ld [%sp + STACKFRAME_SZ + PT_PC], %l1
	ld [%sp + STACKFRAME_SZ + PT_NPC], %l2
	rd %tbr, %l5 /* Never changes... */

	/* Make kgdb exception frame. */
	sub %sp,(16+1+6+1+72)*4,%sp ! Make room for input & locals
	! + hidden arg + arg spill
	! + doubleword alignment
	! + registers[72] local var
	SAVE_KGDB_GLOBALS(sp)
	SAVE_KGDB_INS(sp)
	SAVE_KGDB_SREGS(sp, l4, l0, l3, l5, l1, l2)

	/* We are increasing PIL, so two writes. */
	or %l0, PSR_PIL, %l0
	wr %l0, 0, %psr
	WRITE_PAUSE
	wr %l0, PSR_ET, %psr
	WRITE_PAUSE

	call handle_exception
	add %sp, STACKFRAME_SZ, %o0 ! Pass address of registers

	/* Load new kgdb register set. */
	LOAD_KGDB_GLOBALS(sp)
	LOAD_KGDB_INS(sp)
	LOAD_KGDB_SREGS(sp, l4, l0, l3, l5, l1, l2)
	wr %l4, 0x0, %y

	sethi %hi(in_trap_handler), %l4
	ld [%lo(in_trap_handler) + %l4], %l5
	dec %l5
	st %l5, [%lo(in_trap_handler) + %l4]

	add %sp,(16+1+6+1+72)*4,%sp ! Undo the kgdb trap frame.

	/* Now take what kgdb did and place it into the pt_regs
	* frame which SparcLinux RESTORE_ALL understands.,
	*/
	STORE_PT_INS(sp)
	STORE_PT_GLOBALS(sp)
	STORE_PT_YREG(sp, g2)
	STORE_PT_PRIV(sp, l0, l1, l2)

	RESTORE_ALL
	#endif		#endif

	#if defined(CONFIG_BLK_DEV_FD) \|\| defined(CONFIG_BLK_DEV_FD_MODULE)		#if defined(CONFIG_BLK_DEV_FD) \|\| defined(CONFIG_BLK_DEV_FD_MODULE)
	.text
	.align 4		.align 4
	.globl floppy_hardint		.globl floppy_hardint
	floppy_hardint:		floppy_hardint:
	@@ -1596,6 +1524,23 @@ breakpoint_trap:

	RESTORE_ALL		RESTORE_ALL

			#ifdef CONFIG_KGDB
			.align 4
			.globl kgdb_trap_low
			.type kgdb_trap_low,#function
			kgdb_trap_low:
			rd %wim,%l3
			SAVE_ALL
			wr %l0, PSR_ET, %psr
			WRITE_PAUSE

			call kgdb_trap
			add %sp, STACKFRAME_SZ, %o0

			RESTORE_ALL
			.size kgdb_trap_low,.-kgdb_trap_low
			#endif

	.align 4		.align 4
	.globl __handle_exception, flush_patch_exception		.globl __handle_exception, flush_patch_exception
	__handle_exception:		__handle_exception:
	@@ -1698,4 +1643,22 @@ pcic_nmi_trap_patch:

	#endif /* CONFIG_PCI */		#endif /* CONFIG_PCI */

			.globl flushw_all
			flushw_all:
			save %sp, -0x40, %sp
			save %sp, -0x40, %sp
			save %sp, -0x40, %sp
			save %sp, -0x40, %sp
			save %sp, -0x40, %sp
			save %sp, -0x40, %sp
			save %sp, -0x40, %sp
			restore
			restore
			restore
			restore
			restore
			restore
			ret
			restore

	/* End of entry.S */		/* End of entry.S */

arch/sparc/kernel/head.S

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -191,7 +191,8 @@ t_bade8:BAD_TRAP(0xe8) BAD_TRAP(0xe9) BAD_TRAP(0xea) BAD_TRAP(0xeb) BAD_TRAP(0xe
	t_baded:BAD_TRAP(0xed) BAD_TRAP(0xee) BAD_TRAP(0xef) BAD_TRAP(0xf0) BAD_TRAP(0xf1)		t_baded:BAD_TRAP(0xed) BAD_TRAP(0xee) BAD_TRAP(0xef) BAD_TRAP(0xf0) BAD_TRAP(0xf1)
	t_badf2:BAD_TRAP(0xf2) BAD_TRAP(0xf3) BAD_TRAP(0xf4) BAD_TRAP(0xf5) BAD_TRAP(0xf6)		t_badf2:BAD_TRAP(0xf2) BAD_TRAP(0xf3) BAD_TRAP(0xf4) BAD_TRAP(0xf5) BAD_TRAP(0xf6)
	t_badf7:BAD_TRAP(0xf7) BAD_TRAP(0xf8) BAD_TRAP(0xf9) BAD_TRAP(0xfa) BAD_TRAP(0xfb)		t_badf7:BAD_TRAP(0xf7) BAD_TRAP(0xf8) BAD_TRAP(0xf9) BAD_TRAP(0xfa) BAD_TRAP(0xfb)
	t_badfc:BAD_TRAP(0xfc) BAD_TRAP(0xfd)		t_badfc:BAD_TRAP(0xfc)
			t_kgdb: KGDB_TRAP(0xfd)
	dbtrap: BAD_TRAP(0xfe) /* Debugger/PROM breakpoint #1 */		dbtrap: BAD_TRAP(0xfe) /* Debugger/PROM breakpoint #1 */
	dbtrap2:BAD_TRAP(0xff) /* Debugger/PROM breakpoint #2 */		dbtrap2:BAD_TRAP(0xff) /* Debugger/PROM breakpoint #2 */

	@@ -267,7 +268,7 @@ trapbase_cpu1:
	BAD_TRAP(0xed) BAD_TRAP(0xee) BAD_TRAP(0xef) BAD_TRAP(0xf0) BAD_TRAP(0xf1)		BAD_TRAP(0xed) BAD_TRAP(0xee) BAD_TRAP(0xef) BAD_TRAP(0xf0) BAD_TRAP(0xf1)
	BAD_TRAP(0xf2) BAD_TRAP(0xf3) BAD_TRAP(0xf4) BAD_TRAP(0xf5) BAD_TRAP(0xf6)		BAD_TRAP(0xf2) BAD_TRAP(0xf3) BAD_TRAP(0xf4) BAD_TRAP(0xf5) BAD_TRAP(0xf6)
	BAD_TRAP(0xf7) BAD_TRAP(0xf8) BAD_TRAP(0xf9) BAD_TRAP(0xfa) BAD_TRAP(0xfb)		BAD_TRAP(0xf7) BAD_TRAP(0xf8) BAD_TRAP(0xf9) BAD_TRAP(0xfa) BAD_TRAP(0xfb)
	BAD_TRAP(0xfc) BAD_TRAP(0xfd) BAD_TRAP(0xfe) BAD_TRAP(0xff)		BAD_TRAP(0xfc) KGDB_TRAP(0xfd) BAD_TRAP(0xfe) BAD_TRAP(0xff)

	trapbase_cpu2:		trapbase_cpu2:
	BAD_TRAP(0x0) SRMMU_TFAULT TRAP_ENTRY(0x2, bad_instruction)		BAD_TRAP(0x0) SRMMU_TFAULT TRAP_ENTRY(0x2, bad_instruction)
	@@ -335,7 +336,7 @@ trapbase_cpu2:
	BAD_TRAP(0xed) BAD_TRAP(0xee) BAD_TRAP(0xef) BAD_TRAP(0xf0) BAD_TRAP(0xf1)		BAD_TRAP(0xed) BAD_TRAP(0xee) BAD_TRAP(0xef) BAD_TRAP(0xf0) BAD_TRAP(0xf1)
	BAD_TRAP(0xf2) BAD_TRAP(0xf3) BAD_TRAP(0xf4) BAD_TRAP(0xf5) BAD_TRAP(0xf6)		BAD_TRAP(0xf2) BAD_TRAP(0xf3) BAD_TRAP(0xf4) BAD_TRAP(0xf5) BAD_TRAP(0xf6)
	BAD_TRAP(0xf7) BAD_TRAP(0xf8) BAD_TRAP(0xf9) BAD_TRAP(0xfa) BAD_TRAP(0xfb)		BAD_TRAP(0xf7) BAD_TRAP(0xf8) BAD_TRAP(0xf9) BAD_TRAP(0xfa) BAD_TRAP(0xfb)
	BAD_TRAP(0xfc) BAD_TRAP(0xfd) BAD_TRAP(0xfe) BAD_TRAP(0xff)		BAD_TRAP(0xfc) KGDB_TRAP(0xfd) BAD_TRAP(0xfe) BAD_TRAP(0xff)

	trapbase_cpu3:		trapbase_cpu3:
	BAD_TRAP(0x0) SRMMU_TFAULT TRAP_ENTRY(0x2, bad_instruction)		BAD_TRAP(0x0) SRMMU_TFAULT TRAP_ENTRY(0x2, bad_instruction)
	@@ -403,7 +404,7 @@ trapbase_cpu3:
	BAD_TRAP(0xed) BAD_TRAP(0xee) BAD_TRAP(0xef) BAD_TRAP(0xf0) BAD_TRAP(0xf1)		BAD_TRAP(0xed) BAD_TRAP(0xee) BAD_TRAP(0xef) BAD_TRAP(0xf0) BAD_TRAP(0xf1)
	BAD_TRAP(0xf2) BAD_TRAP(0xf3) BAD_TRAP(0xf4) BAD_TRAP(0xf5) BAD_TRAP(0xf6)		BAD_TRAP(0xf2) BAD_TRAP(0xf3) BAD_TRAP(0xf4) BAD_TRAP(0xf5) BAD_TRAP(0xf6)
	BAD_TRAP(0xf7) BAD_TRAP(0xf8) BAD_TRAP(0xf9) BAD_TRAP(0xfa) BAD_TRAP(0xfb)		BAD_TRAP(0xf7) BAD_TRAP(0xf8) BAD_TRAP(0xf9) BAD_TRAP(0xfa) BAD_TRAP(0xfb)
	BAD_TRAP(0xfc) BAD_TRAP(0xfd) BAD_TRAP(0xfe) BAD_TRAP(0xff)		BAD_TRAP(0xfc) KGDB_TRAP(0xfd) BAD_TRAP(0xfe) BAD_TRAP(0xff)

	#endif		#endif
	.align PAGE_SIZE		.align PAGE_SIZE