9 files changed, 10 insertions, 41 deletions
diff --git a/usr/src/uts/intel/sys/archsystm.h b/usr/src/uts/intel/sys/archsystm.h
index 4127e669ab..99a8d89cc5 100644
--- a/usr/src/uts/intel/sys/archsystm.h
+++ b/usr/src/uts/intel/sys/archsystm.h
@@ -129,11 +129,7 @@ extern uint_t cpu_hwcap_flags;
 extern uint_t cpu_freq;
 extern uint64_t cpu_freq_hz;
 
-#ifdef __ia64
-extern caddr_t ia64devmap(pfn_t, pgcnt_t, uint_t);
-#else
 extern caddr_t i86devmap(pfn_t, pgcnt_t, uint_t);
-#endif
 extern page_t *page_numtopp_alloc(pfn_t pfnum);
 
 extern void hwblkclr(void *, size_t);
diff --git a/usr/src/uts/intel/sys/asm_linkage.h b/usr/src/uts/intel/sys/asm_linkage.h
index 707f72a9bb..6dcc9c4f9f 100644
--- a/usr/src/uts/intel/sys/asm_linkage.h
+++ b/usr/src/uts/intel/sys/asm_linkage.h
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -33,10 +33,6 @@
 
 #include <ia32/sys/asm_linkage.h>	/* XX64	x86/sys/asm_linkage.h */
 
-#elif defined(__ia64)
-
-#include <ia64/sys/asm_linkage.h>
-
 #endif
 
 #endif	/* _SYS_ASM_LINKAGE_H */
diff --git a/usr/src/uts/intel/sys/machelf.h b/usr/src/uts/intel/sys/machelf.h
index 65133b8804..dec2e89db5 100644
--- a/usr/src/uts/intel/sys/machelf.h
+++ b/usr/src/uts/intel/sys/machelf.h
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -33,9 +33,7 @@
 extern "C" {
 #endif
 
-#if defined(__ia64)
-#include <sys/elf_ia64.h>
-#elif defined(__amd64)
+#if defined(__amd64)
 #include <sys/elf_amd64.h>
 #elif defined(__i386)
 #include <sys/elf_386.h>
diff --git a/usr/src/uts/intel/sys/procfs_isa.h b/usr/src/uts/intel/sys/procfs_isa.h
index 44a8b4dd1a..b7a6cc3582 100644
--- a/usr/src/uts/intel/sys/procfs_isa.h
+++ b/usr/src/uts/intel/sys/procfs_isa.h
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -77,7 +77,7 @@ typedef	uchar_t instr_t;
  * kernel view of the ia32 register set
  */
 typedef	uchar_t		instr32_t;
-#if defined(__ia64) || defined(__amd64)
+#if defined(__amd64)
 #define	NPRGREG32	_NGREG32
 #define	prgreg32_t	greg32_t
 #define	prgregset32_t	gregset32_t
diff --git a/usr/src/uts/intel/sys/promimpl.h b/usr/src/uts/intel/sys/promimpl.h
index 9a4076ff55..699598925e 100644
--- a/usr/src/uts/intel/sys/promimpl.h
+++ b/usr/src/uts/intel/sys/promimpl.h
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -42,11 +42,6 @@
 
 #include <sys/types.h>
 #include <sys/promif.h>
-#ifdef __ia64
-/* XXX Merced -- these includes are for the ia64 simulator */
-#include <sys/types_ia64.h>
-#include <sys/ssc.h>
-#endif
 #include <sys/dditypes.h>
 #include <sys/ddidmareq.h>
 #include <sys/ddi_impldefs.h>
diff --git a/usr/src/uts/intel/sys/psw.h b/usr/src/uts/intel/sys/psw.h
index b38da2a703..8b84f5ff3a 100644
--- a/usr/src/uts/intel/sys/psw.h
+++ b/usr/src/uts/intel/sys/psw.h
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -33,10 +33,6 @@
 
 #include <ia32/sys/psw.h>	/* XX64 x86/sys/psw.h */
 
-#elif defined(__ia64)
-
-#include <ia64/sys/psw.h>
-
 #endif
 
 #endif	/* _SYS_PSW_H */
diff --git a/usr/src/uts/intel/sys/pte.h b/usr/src/uts/intel/sys/pte.h
index 4b7a6a8ddc..09c009d421 100644
--- a/usr/src/uts/intel/sys/pte.h
+++ b/usr/src/uts/intel/sys/pte.h
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -33,10 +33,6 @@
 
 #include <ia32/sys/pte.h>	/* XX64 x86/sys/pte.h */
 
-#elif defined(__ia64)
-
-#include <ia64/sys/pte.h>
-
 #endif
 
 #endif	/* _SYS_PTE_H */
diff --git a/usr/src/uts/intel/sys/stack.h b/usr/src/uts/intel/sys/stack.h
index cb7e7cd576..5521acfc8f 100644
--- a/usr/src/uts/intel/sys/stack.h
+++ b/usr/src/uts/intel/sys/stack.h
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -33,10 +33,6 @@
 
 #include <ia32/sys/stack.h>	/* XX64 x86/sys/stack.h */
 
-#elif defined(__ia64)
-
-#include <ia64/sys/stack.h>
-
 #endif
 
 #endif	/* _SYS_STACK_H */
diff --git a/usr/src/uts/intel/sys/trap.h b/usr/src/uts/intel/sys/trap.h
index c87f40b9d5..d412386176 100644
--- a/usr/src/uts/intel/sys/trap.h
+++ b/usr/src/uts/intel/sys/trap.h
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -33,10 +33,6 @@
 
 #include <ia32/sys/trap.h>	/* XX64	x86/sys/trap.h */
 
-#elif defined(__ia64)
-
-#include <ia64/sys/trap.h>
-
 #endif
 
 #endif	/* _SYS_TRAP_H */