PERFORCE change 149441 for review

[Peter Wemm]

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

Change 149441 by peter at peter_overcee on 2008/09/08 20:28:31

	Fix mismerge

Affected files ...

.. //depot/projects/hammer/sys/amd64/include/pcpu.h#33 edit
.. //depot/projects/hammer/sys/i386/include/pcpu.h#19 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/include/pcpu.h#33 (text+ko) ====

@@ -53,7 +53,6 @@
 
 #ifdef _KERNEL
 #define PCPU_MD_ALIGN	__aligned(64)	/* use unique cache line per entry */
-#endif
 
 #ifdef lint
 

==== //depot/projects/hammer/sys/i386/include/pcpu.h#19 (text+ko) ====

@@ -83,7 +83,6 @@
 
 #ifdef _KERNEL
 #define PCPU_MD_ALIGN	__aligned(64)	/* max cache line size */
-#endif
 
 #ifdef lint