PERFORCE change 30002 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=30002

Change 30002 by peter at peter_overcee on 2003/04/28 16:17:04

	s/__x86_64__/__amd64__/g

Affected files ...

.. //depot/projects/hammer/sys/dev/fb/fbreg.h#5 edit
.. //depot/projects/hammer/sys/dev/fb/vga.c#8 edit
.. //depot/projects/hammer/sys/dev/kbd/atkbdc.c#4 edit
.. //depot/projects/hammer/sys/isa/isa_common.c#7 edit
.. //depot/projects/hammer/sys/kern/kern_synch.c#12 edit
.. //depot/projects/hammer/sys/kern/kern_thr.c#5 edit
.. //depot/projects/hammer/sys/kern/kern_thread.c#21 edit
.. //depot/projects/hammer/sys/sys/proc.h#18 edit
.. //depot/projects/hammer/sys/sys/user.h#5 edit

Differences ...

==== //depot/projects/hammer/sys/dev/fb/fbreg.h#5 (text+ko) ====

@@ -44,7 +44,7 @@
 void generic_bcopy(const void *s, void *d, size_t c);
 void generic_bzero(void *d, size_t c);
 #else /* !__i386__ */
-#ifdef __x86_64__
+#ifdef __amd64__
 #define bcopy_io(s, d, c)	bcopy((void *)(s), (void *)(d), (c))
 #define bcopy_toio(s, d, c)	bcopy((void *)(s), (void *)(d), (c))
 #define bcopy_fromio(s, d, c)	bcopy((void *)(s), (void *)(d), (c))

==== //depot/projects/hammer/sys/dev/fb/vga.c#8 (text+ko) ====

@@ -1320,7 +1320,7 @@
     return 0;
 }
 
-#if defined(__i386__) || defined(__x86_64__)	/* XXX */
+#if defined(__i386__) || defined(__amd64__)	/* XXX */
 static void
 fill(int val, void *d, size_t size)
 {

==== //depot/projects/hammer/sys/dev/kbd/atkbdc.c#4 (text+ko) ====

@@ -154,7 +154,7 @@
 #endif
 
 	/* XXX: tag should be passed from the caller */
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__amd64__)
 	tag = I386_BUS_SPACE_IO;
 #elif defined(__alpha__)
 	tag = busspace_isa_io;

==== //depot/projects/hammer/sys/isa/isa_common.c#7 (text+ko) ====

@@ -1112,7 +1112,7 @@
  */
 DRIVER_MODULE(isa, isab, isa_driver, isa_devclass, 0, 0);
 DRIVER_MODULE(isa, eisab, isa_driver, isa_devclass, 0, 0);
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__amd64__)
 DRIVER_MODULE(isa, legacy, isa_driver, isa_devclass, 0, 0);
 #endif
 MODULE_VERSION(isa, 1);

==== //depot/projects/hammer/sys/kern/kern_synch.c#12 (text+ko) ====

@@ -457,7 +457,7 @@
 {
 	struct bintime new_switchtime;
 	struct thread *td;
-#if defined(__i386__) || defined(__sparc64__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__)
 	struct thread *newtd;
 #endif
 	struct proc *p;
@@ -517,7 +517,7 @@
 		thread_switchout(td);
 	sched_switchout(td);
 
-#if defined(__i386__) || defined(__sparc64__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__)
 	newtd = choosethread();
 	if (td != newtd)
 		cpu_switch(td, newtd);	/* SHAZAM!! */

==== //depot/projects/hammer/sys/kern/kern_thr.c#5 (text+ko) ====

@@ -111,7 +111,7 @@
 	sched_exit_thread(TAILQ_NEXT(td, td_kglist), td);
 	thread_stash(td);
 
-#if defined(__i386__) || defined(__sparc64__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__)
 	cpu_throw(td, choosethread());
 #else
 	cpu_throw();

==== //depot/projects/hammer/sys/kern/kern_thread.c#21 (text+ko) ====

@@ -1221,7 +1221,7 @@
 	}
 	/* XXX Shouldn't cpu_throw() here. */
 	mtx_assert(&sched_lock, MA_OWNED);
-#if defined(__i386__) || defined(__sparc64__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__)
 	cpu_throw(td, choosethread());
 #else
 	cpu_throw();

==== //depot/projects/hammer/sys/sys/proc.h#18 (text+ko) ====

@@ -875,7 +875,7 @@
 void	sleepinit(void);
 void	stopevent(struct proc *, u_int, u_int);
 void	cpu_idle(void);
-#if defined(__i386__) || defined(__sparc64__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__)
 void	cpu_switch(struct thread *old, struct thread *new);
 void	cpu_throw(struct thread *old, struct thread *new) __dead2;
 #else

==== //depot/projects/hammer/sys/sys/user.h#5 (text+ko) ====

@@ -74,7 +74,7 @@
  * to initialize it in two places: kern/kern_proc.c in the function
  * fill_kinfo_proc and in lib/libkvm/kvm_proc.c in the function kvm_proclist.
  */
-#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__x86_64__)
+#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__)
 #define	KINFO_PROC_SIZE	912		/* the correct size for kinfo_proc */
 #endif
 #ifdef	__i386__