style(9) and make consistent across platforms

1 files changed, 13 insertions, 14 deletions

diff --git a/sys/powerpc/include/pcpu.h b/sys/powerpc/include/pcpu.h
index 225349a..b51592a 100644
--- a/sys/powerpc/include/pcpu.h
+++ b/sys/powerpc/include/pcpu.h
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 1999 Luoqi Chen <luoqi@freebsd.org>
+ * Copyright (c) Peter Wemm <peter@netplex.com.au>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,27 +44,25 @@
  * point at the globaldata structure.
  */
 struct globaldata {
-	struct proc	*gd_curproc;		/* current process */
-	struct proc	*gd_idleproc;		/* idle process */
-	struct proc	*gd_fpcurproc;		/* fp state owner */
-	struct pcb	*gd_curpcb;		/* current pcb */
-	struct timeval	gd_switchtime;	
-	int		gd_switchticks;
-	u_int		gd_cpuid;		/* this cpu number */
-	u_int		gd_other_cpus;		/* all other cpus */
-	int		gd_inside_intr;
+	struct	proc *gd_curproc;		/* current process */
+	struct	proc *gd_idleproc;		/* idle process */
+	struct	proc *gd_fpcurproc;		/* fp state owner */
+	struct	pcb *gd_curpcb;			/* current pcb */
+	struct	timeval gd_switchtime;	
+	int	gd_switchticks;
+	u_int	gd_cpuid;			/* this cpu number */
+	u_int	gd_other_cpus;			/* all other cpus */
+	int	gd_inside_intr;
 	u_int32_t	gd_next_asn;		/* next ASN to allocate */
 	u_int32_t	gd_current_asngen;	/* ASN rollover check */
 	u_int32_t	gd_intr_nesting_level;  /* interrupt recursion */
 
 	SLIST_ENTRY(globaldata) gd_allcpu;
-	struct lock_list_entry *gd_spinlocks;
+	struct	lock_list_entry *gd_spinlocks;
 #ifdef KTR_PERCPU
-#ifdef KTR
 	volatile int	gd_ktr_idx;		/* Index into trace table */
-	char		*gd_ktr_buf;
-	char		gd_ktr_buf_data[KTR_SIZE];
-#endif
+	char	*gd_ktr_buf;
+	char	gd_ktr_buf_data[KTR_SIZE];
 #endif
 };