2001-04-04 Roland McGrath <roland@frob.com>

	* ddb/db_access.h: Fix obsolescent #else/#endif syntax.
	* ddb/db_aout.c: Likewise.
	* ddb/db_break.c: Likewise.
	* ddb/db_break.h: Likewise.
	* ddb/db_command.c: Likewise.
	* ddb/db_command.h: Likewise.
	* ddb/db_cond.c: Likewise.
	* ddb/db_examine.c: Likewise.
	* ddb/db_expr.c: Likewise.
	* ddb/db_ext_symtab.c: Likewise.
	* ddb/db_input.c: Likewise.
	* ddb/db_lex.c: Likewise.
	* ddb/db_macro.c: Likewise.
	* ddb/db_mp.c: Likewise.
	* ddb/db_output.c: Likewise.
	* ddb/db_print.c: Likewise.
	* ddb/db_run.c: Likewise.
	* ddb/db_sym.c: Likewise.
	* ddb/db_task_thread.c: Likewise.
	* ddb/db_task_thread.h: Likewise.
	* ddb/db_trap.c: Likewise.
	* ddb/db_variables.c: Likewise.
	* ddb/db_watch.c: Likewise.
	* ddb/db_watch.h: Likewise.
	* ddb/db_write_cmd.c: Likewise.
	* device/dev_pager.c: Likewise.
	* device/device_port.h: Likewise.
	* device/device_types_kernel.h: Likewise.
	* device/ds_routines.h: Likewise.
	* device/errno.h: Likewise.
	* device/if_ether.h: Likewise.
	* device/if_hdr.h: Likewise.
	* device/io_req.h: Likewise.
	* device/net_io.c: Likewise.
	* device/net_io.h: Likewise.
	* i386/i386/ast_check.c: Likewise.
	* i386/i386/cswitch.S: Likewise.
	* i386/i386/db_disasm.c: Likewise.
	* i386/i386/db_interface.c: Likewise.
	* i386/i386/db_trace.c: Likewise.
	* i386/i386/debug.h: Likewise.
	* i386/i386/debug_i386.c: Likewise.
	* i386/i386/debug_trace.S: Likewise.
	* i386/i386/eflags.h: Likewise.
	* i386/i386/gdt.h: Likewise.
	* i386/i386/hardclock.c: Likewise.
	* i386/i386/idt-gen.h: Likewise.
	* i386/i386/ipl.h: Likewise.
	* i386/i386/ktss.h: Likewise.
	* i386/i386/kttd_interface.c: Likewise.
	* i386/i386/ldt.h: Likewise.
	* i386/i386/lock.h: Likewise.
	* i386/i386/locore.S: Likewise.
	* i386/i386/mp_desc.h: Likewise.
	* i386/i386/pic.c: Likewise.
	* i386/i386/pic.h: Likewise.
	* i386/i386/pio.h: Likewise.
	* i386/i386/pit.h: Likewise.
	* i386/i386/seg.h: Likewise.
	* i386/i386/thread.h: Likewise.
	* i386/i386/trap.c: Likewise.
	* i386/i386/trap.h: Likewise.
	* i386/i386/vm_param.h: Likewise.
	* i386/i386/vm_tuning.h: Likewise.
	* i386/i386at/autoconf.c: Likewise.
	* i386/i386at/blit.c: Likewise.
	* i386/i386at/conf.c: Likewise.
	* i386/i386at/fd.c: Likewise.
	* i386/i386at/idt.h: Likewise.
	* i386/i386at/immc.c: Likewise.
	* i386/i386at/kd.c: Likewise.
	* i386/i386at/kd_event.c: Likewise.
	* i386/i386at/kd_mouse.c: Likewise.
	* i386/i386at/model_dep.c: Likewise.
	* i386/i386at/rtc.c: Likewise.
	* i386/include/mach/i386/asm.h: Likewise.
	* i386/include/mach/i386/eflags.h: Likewise.
	* i386/include/mach/i386/mach_i386.defs: Likewise.
	* i386/include/mach/i386/multiboot.h: Likewise.
	* i386/include/mach/i386/trap.h: Likewise.
	* i386/include/mach/i386/vm_types.h: Likewise.
	* i386/include/mach/sa/stdarg.h: Likewise.
	* i386/intel/pmap.c: Likewise.
	* i386/intel/pmap.h: Likewise.
	* include/alloca.h: Likewise.
	* include/device/device_types.defs: Likewise.
	* include/device/device_types.h: Likewise.
	* include/device/disk_status.h: Likewise.
	* include/device/net_status.h: Likewise.
	* include/mach/mach.defs: Likewise.
	* include/mach/memory_object.defs: Likewise.
	* include/mach/std_types.defs: Likewise.
	* include/mach_debug/hash_info.h: Likewise.
	* include/mach_debug/ipc_info.h: Likewise.
	* include/mach_debug/mach_debug.defs: Likewise.
	* include/mach_debug/mach_debug_types.defs: Likewise.
	* include/mach_debug/mach_debug_types.h: Likewise.
	* include/mach_debug/vm_info.h: Likewise.
	* include/mach_debug/zone_info.h: Likewise.
	* include/sys/ioctl.h: Likewise.
	* include/sys/time.h: Likewise.
	* ipc/ipc_entry.h: Likewise.
	* ipc/ipc_hash.h: Likewise.
	* ipc/ipc_init.c: Likewise.
	* ipc/ipc_kmsg.c: Likewise.
	* ipc/ipc_kmsg.h: Likewise.
	* ipc/ipc_marequest.c: Likewise.
	* ipc/ipc_marequest.h: Likewise.
	* ipc/ipc_mqueue.c: Likewise.
	* ipc/ipc_mqueue.h: Likewise.
	* ipc/ipc_notify.c: Likewise.
	* ipc/ipc_notify.h: Likewise.
	* ipc/ipc_object.c: Likewise.
	* ipc/ipc_object.h: Likewise.
	* ipc/ipc_port.c: Likewise.
	* ipc/ipc_port.h: Likewise.
	* ipc/ipc_pset.c: Likewise.
	* ipc/ipc_pset.h: Likewise.
	* ipc/ipc_right.c: Likewise.
	* ipc/ipc_right.h: Likewise.
	* ipc/ipc_space.c: Likewise.
	* ipc/ipc_space.h: Likewise.
	* ipc/mach_debug.c: Likewise.
	* ipc/mach_msg.c: Likewise.
	* ipc/mach_msg.h: Likewise.
	* ipc/mach_port.c: Likewise.
	* kern/act.c: Likewise.
	* kern/assert.h: Likewise.
	* kern/ast.c: Likewise.
	* kern/ast.h: Likewise.
	* kern/bootstrap.c: Likewise.
	* kern/counters.c: Likewise.
	* kern/counters.h: Likewise.
	* kern/debug.h: Likewise.
	* kern/exception.c: Likewise.
	* kern/host.h: Likewise.
	* kern/ipc_host.c: Likewise.
	* kern/ipc_host.h: Likewise.
	* kern/ipc_kobject.c: Likewise.
	* kern/ipc_mig.c: Likewise.
	* kern/ipc_tt.c: Likewise.
	* kern/ipc_tt.h: Likewise.
	* kern/kalloc.h: Likewise.
	* kern/lock_mon.c: Likewise.
	* kern/mach_clock.c: Likewise.
	* kern/mach_factor.c: Likewise.
	* kern/mach_param.h: Likewise.
	* kern/machine.c: Likewise.
	* kern/processor.c: Likewise.
	* kern/profile.c: Likewise.
	* kern/queue.h: Likewise.
	* kern/sched.h: Likewise.
	* kern/startup.c: Likewise.
	* kern/syscall_emulation.h: Likewise.
	* kern/syscall_subr.c: Likewise.
	* kern/syscall_subr.h: Likewise.
	* kern/syscall_sw.c: Likewise.
	* kern/syscall_sw.h: Likewise.
	* kern/task.h: Likewise.
	* kern/thread_swap.h: Likewise.
	* kern/time_out.h: Likewise.
	* kern/time_stamp.c: Likewise.
	* kern/time_stamp.h: Likewise.
	* kern/timer.c: Likewise.
	* kern/timer.h: Likewise.
	* kern/xpr.c: Likewise.
	* kern/xpr.h: Likewise.
	* kern/zalloc.c: Likewise.
	* kern/zalloc.h: Likewise.
	* linux/dev/drivers/block/ide.c: Likewise.
	* linux/dev/include/linux/blk.h: Likewise.
	* linux/src/include/linux/cdrom.h: Likewise.
	* linux/src/include/linux/md.h: Likewise.
	* util/cpu.h: Likewise.
	* vm/memory_object.c: Likewise.
	* vm/memory_object.h: Likewise.
	* vm/pmap.h: Likewise.
	* vm/vm_debug.c: Likewise.
	* vm/vm_external.h: Likewise.
	* vm/vm_fault.c: Likewise.
	* vm/vm_fault.h: Likewise.
	* vm/vm_kern.h: Likewise.
	* vm/vm_map.c: Likewise.
	* vm/vm_map.h: Likewise.
	* vm/vm_object.h: Likewise.
	* vm/vm_pageout.c: Likewise.
	* vm/vm_pageout.h: Likewise.
	* vm/vm_user.h: Likewise.

2 files changed, 42 insertions, 42 deletions

diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c
index 2d66bf1..fc56e87 100644
--- a/i386/intel/pmap.c
+++ b/i386/intel/pmap.c
@@ -83,12 +83,12 @@
 
 #ifdef	ORC
 #define	OLIVETTICACHE	1
-#endif	ORC
+#endif	/* ORC */
 
 #ifndef	OLIVETTICACHE
 #define	WRITE_PTE(pte_p, pte_entry)		*(pte_p) = (pte_entry);
 #define	WRITE_PTE_FAST(pte_p, pte_entry)	*(pte_p) = (pte_entry);
-#else	OLIVETTICACHE
+#else	/* OLIVETTICACHE */
 #error might not work anymore
 
 /* This gross kludgery is needed for Olivetti XP7 & XP9 boxes to get
@@ -125,7 +125,7 @@ pt_entry_t	*pte_p, pte_entry;
 
 #define	WRITE_PTE_FAST(pte_p, pte_entry)*pte_p = pte_entry;
 
-#endif	OLIVETTICACHE
+#endif	/* OLIVETTICACHE */
 
 /*
  *	Private data structures.
@@ -349,7 +349,7 @@ lock_data_t	pmap_system_lock;
 	} \
 }
 
-#else	NCPUS > 1
+#else	/* NCPUS > 1 */
 
 #define SPLVM(spl)
 #define SPLX(spl)
@@ -370,7 +370,7 @@ lock_data_t	pmap_system_lock;
 	} \
 }
 
-#endif	NCPUS > 1
+#endif	/* NCPUS > 1 */
 
 #define MAX_TBIS_SIZE	32		/* > this -> TBIA */ /* XXX */
 
@@ -380,11 +380,11 @@ lock_data_t	pmap_system_lock;
 	flush(); \
 	flush_tlb(); \
 }
-#else	i860
+#else	/* i860 */
 #define INVALIDATE_TLB(s, e) { \
 	flush_tlb(); \
 }
-#endif	i860
+#endif	/* i860 */
 
 
 #if	NCPUS > 1
@@ -415,7 +415,7 @@ typedef	struct pmap_update_list	*pmap_update_list_t;
 
 struct pmap_update_list	cpu_update_list[NCPUS];
 
-#endif	NCPUS > 1
+#endif	/* NCPUS > 1 */
 
 /*
  *	Other useful macros.
@@ -450,7 +450,7 @@ pt_entry_t *kernel_page_dir;
 void pmap_remove_range();	/* forward */
 #if	NCPUS > 1
 void signal_cpus();		/* forward */
-#endif	NCPUS > 1
+#endif	/* NCPUS > 1 */
 
 #if	i860
 /*
@@ -520,7 +520,7 @@ void ptep_check(ptep)
 		panic("pte count");
 	}
 }
-#endif	DEBUG_PTE_PAGE
+#endif	/* DEBUG_PTE_PAGE */
 
 /*
  *	Map memory at initialization.  The physical addresses being
@@ -614,7 +614,7 @@ void pmap_bootstrap()
 
 #if	NCPUS > 1
 	lock_init(&pmap_system_lock, FALSE);	/* NOT a sleep lock */
-#endif	NCPUS > 1
+#endif	/* NCPUS > 1 */
 
 	simple_lock_init(&kernel_pmap->lock);
 
@@ -852,7 +852,7 @@ void pmap_init()
 	    simple_lock_init(&up->lock);
 	    up->count = 0;
 	}
-#endif	NCPUS > 1
+#endif	/* NCPUS > 1 */
 
 	/*
 	 * Indicate that the PMAP module is now fully initialized.
@@ -1126,7 +1126,7 @@ void pmap_remove_range(pmap, va, spte, epte)
 #if	DEBUG_PTE_PAGE
 	if (pmap != kernel_pmap)
 		ptep_check(get_pte_page(spte));
-#endif	DEBUG_PTE_PAGE
+#endif	/* DEBUG_PTE_PAGE */
 	num_removed = 0;
 	num_unwired = 0;
 
@@ -1730,7 +1730,7 @@ Retry:
 			    e = e->next;
 			}
 		    }
-#endif	DEBUG
+#endif	/* DEBUG */
 
 		    /*
 		     *	Add new pv_entry after header.
@@ -1888,9 +1888,9 @@ void pmap_copy(dst_pmap, src_pmap, dst_addr, len, src_addr)
 {
 #ifdef	lint
 	dst_pmap++; src_pmap++; dst_addr++; len++; src_addr++;
-#endif	lint
+#endif	/* lint */
 }
-#endif	0
+#endif	/* 0 */
 
 /*
  *	Routine:	pmap_collect
@@ -2014,7 +2014,7 @@ void pmap_activate(my_pmap, th, my_cpu)
 {
 	PMAP_ACTIVATE(my_pmap, th, my_cpu);
 }
-#endif	0
+#endif	/* 0 */
 
 /*
  *	Routine:	pmap_deactivate
@@ -2031,10 +2031,10 @@ void pmap_deactivate(pmap, th, which_cpu)
 {
 #ifdef	lint
 	pmap++; th++; which_cpu++;
-#endif	lint
+#endif	/* lint */
 	PMAP_DEACTIVATE(pmap, th, which_cpu);
 }
-#endif	0
+#endif	/* 0 */
 
 /*
  *	Routine:	pmap_kernel
@@ -2046,7 +2046,7 @@ pmap_t pmap_kernel()
 {
     	return (kernel_pmap);
 }
-#endif	0
+#endif	/* 0 */
 
 /*
  *	pmap_zero_page zeros the specified (machine independent) page.
@@ -2065,7 +2065,7 @@ pmap_zero_page(phys)
 	while (i--)
 		zero_phys(phys++);
 }
-#endif	0
+#endif	/* 0 */
 
 /*
  *	pmap_copy_page copies the specified (machine independent) page.
@@ -2087,7 +2087,7 @@ pmap_copy_page(src, dst)
 		dst += INTEL_PGBYTES;
 	}
 }
-#endif	0
+#endif	/* 0 */
 
 /*
  *	Routine:	pmap_pageable
@@ -2111,7 +2111,7 @@ pmap_pageable(pmap, start, end, pageable)
 {
 #ifdef	lint
 	pmap++; start++; end++; pageable++;
-#endif	lint
+#endif	/* lint */
 }
 
 /*
@@ -2528,7 +2528,7 @@ void pmap_update_interrupt()
 
 	splx(s);
 }
-#else	NCPUS > 1
+#else	/* NCPUS > 1 */
 /*
  *	Dummy routine to satisfy external reference.
  */
@@ -2536,7 +2536,7 @@ void pmap_update_interrupt()
 {
 	/* should never be called. */
 }
-#endif	NCPUS > 1
+#endif	/* NCPUS > 1 */
 
 #if	i860	/* akp */
 void set_dirbase(dirbase)
@@ -2546,7 +2546,7 @@ void set_dirbase(dirbase)
 	/*flush_tlb();*/
 	flush_and_ctxsw(dirbase);
 }
-#endif	i860
+#endif	/* i860 */
 
 #ifdef i386
 /* Unmap page 0 to trap NULL references.  */
diff --git a/i386/intel/pmap.h b/i386/intel/pmap.h
index 6e759a6..a638f22 100644
--- a/i386/intel/pmap.h
+++ b/i386/intel/pmap.h
@@ -2,24 +2,24 @@
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -57,7 +57,7 @@
 #define trunc_intel_to_vm(x)	trunc_i386_to_vm(x)
 #define round_intel_to_vm(x)	round_i386_to_vm(x)
 #define vm_to_intel(x)		vm_to_i386(x)
-#endif	i386
+#endif	/* i386 */
 #if	i860
 #define	INTEL_PGBYTES		I860_PGBYTES
 #define INTEL_PGSHIFT		I860_PGSHIFT
@@ -68,7 +68,7 @@
 #define trunc_intel_to_vm(x)	trunc_i860_to_vm(x)
 #define round_intel_to_vm(x)	round_i860_to_vm(x)
 #define vm_to_intel(x)		vm_to_i860(x)
-#endif	i860
+#endif	/* i860 */
 
 /*
  *	i386/i486/i860 Page Table Entry
@@ -77,7 +77,7 @@
 typedef unsigned int	pt_entry_t;
 #define PT_ENTRY_NULL	((pt_entry_t *) 0)
 
-#endif	ASSEMBLER
+#endif	/* ASSEMBLER */
 
 #define INTEL_OFFMASK	0xfff	/* offset within page */
 #define PDESHIFT	22	/* page descriptor shift */
@@ -130,13 +130,13 @@ typedef unsigned int	pt_entry_t;
 				|INTEL_PTE_REF		\
 				|INTEL_PTE_MOD		\
 				)
-#else	NOCACHE
+#else	/* NOCACHE */
 #define	INTEL_PTE_VALID		(INTEL_PTE_valid	\
 				|INTEL_PTE_REF		\
 				|INTEL_PTE_MOD		\
 				)
-#endif	NOCACHE
-#endif	i860
+#endif	/* NOCACHE */
+#endif	/* i860 */
 
 #define	pa_to_pte(a)		((a) & INTEL_PTE_PFN)
 #define	pte_to_pa(p)		((p) & INTEL_PTE_PFN)
@@ -199,7 +199,7 @@ void		process_pmap_updates();
 void		pmap_update_interrupt();
 extern	pmap_t	kernel_pmap;
 
-#endif	NCPUS > 1
+#endif	/* NCPUS > 1 */
 
 /*
  *	Machine dependent routines that are used only for i386/i486/i860.
@@ -355,7 +355,7 @@ pt_entry_t *pmap_pte(pmap_t pmap, vm_offset_t addr);
 	splx(s);							\
 }
 
-#else	NCPUS > 1
+#else	/* NCPUS > 1 */
 
 /*
  *	With only one CPU, we just have to indicate whether the pmap is
@@ -384,7 +384,7 @@ pt_entry_t *pmap_pte(pmap_t pmap, vm_offset_t addr);
 	    (pmap)->cpus_using = FALSE;					\
 }
 
-#endif	NCPUS > 1
+#endif	/* NCPUS > 1 */
 
 #define PMAP_CONTEXT(pmap, thread)
 
@@ -396,6 +396,6 @@ pt_entry_t *pmap_pte(pmap_t pmap, vm_offset_t addr);
 #define	pmap_attribute(pmap,addr,size,attr,value) \
 					(KERN_INVALID_ADDRESS)
 
-#endif	ASSEMBLER
+#endif	/* ASSEMBLER */
 
-#endif	_PMAP_MACHINE_
+#endif	/* _PMAP_MACHINE_ */