[PATCH] m32r: cosmetic updates and trivial fixes

Cosmetic updates and trivial fixes of m32r arch-dependent files. - Remove RCS ID strings and trailing white lines - Other misc. cosmetic updates Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

[PATCH] m32r: cosmetic updates and trivial fixes
Cosmetic updates and trivial fixes of m32r arch-dependent files. - Remove RCS ID strings and trailing white lines - Other misc. cosmetic updates Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Hirokazu Takata · Linus Torvalds
1 parent 3d60f84934
Showing 71 changed files with 68 additions and 258 deletions Side-by-side Diff
arch/m32r/kernel/head.S
arch/m32r/lib/ashxdi3.S
arch/m32r/lib/checksum.S
arch/m32r/lib/delay.c
arch/m32r/lib/memcpy.S
arch/m32r/lib/memset.S
arch/m32r/lib/strlen.S
arch/m32r/mm/fault-nommu.c
arch/m32r/mm/mmu.S
include/asm-m32r/a.out.h
include/asm-m32r/addrspace.h
include/asm-m32r/bugs.h
include/asm-m32r/byteorder.h
include/asm-m32r/cache.h
include/asm-m32r/current.h
include/asm-m32r/delay.h
include/asm-m32r/dma.h
include/asm-m32r/errno.h
include/asm-m32r/ide.h
include/asm-m32r/ioctls.h
@@ -7,8 +7,6 @@
  *                            Hitoshi Yamamoto
  */
  
-/* $Id$ */
-
 #include <linux/init.h>
 __INIT
 __INITDATA
@@ -4,8 +4,6 @@
  * Copyright (C) 2001,2002  Hiroyuki Kondo, and Hirokazu Takata
  *
  */
-/* $Id$ */
-
  
 ;
 ;      input   (r0,r1)  src
@@ -25,9 +25,7 @@
  *		as published by the Free Software Foundation; either version
  *		2 of the License, or (at your option) any later version.
  */
-/* $Id$ */
  
-
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/errno.h>
@@ -318,4 +316,6 @@
 	nop
 	nop
 	nop
+
+	.end
@@ -5,8 +5,6 @@
  * Copyright (c) 2004  Hirokazu Takata
  */
  
-/* $Id$ */
-
 #include <linux/param.h>
 #ifdef CONFIG_SMP
 #include <linux/sched.h>
@@ -10,8 +10,6 @@
  *        src: r1
  *        n  : r2
  */
-/* $Id$ */
-
  
 	.text
 #include <linux/linkage.h>
@@ -12,8 +12,6 @@
  *        ret: r0
  *
  */
-/* $Id$ */
-
  
 	.text
 	.global	memset
@@ -6,8 +6,6 @@
  *  size_t strlen(const char *s);
  *
  */
-/* $Id$ */
-
  
 #include <linux/linkage.h>
 #include <asm/assembler.h>
@@ -7,8 +7,6 @@
  *    Copyright (C) 1995  Linus Torvalds
  */
  
-/* $Id: fault-nommu.c,v 1.1 2004/03/30 06:40:59 sakugawa Exp $ */
-
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
@@ -67,7 +65,7 @@
 	 * without oops_in_progress set so that printk will give klogd
 	 * a poke.  Hold onto your hats...
 	 */
-	console_loglevel = 15;		/* NMI oopser may have shut the console up */
+	console_loglevel = 15;	/* NMI oopser may have shut the console up */
 	printk(" ");
 	console_loglevel = loglevel_save;
 }
@@ -4,8 +4,6 @@
  *  Copyright (C) 2001 by Hiroyuki Kondo
  */
  
-/* $Id: mmu.S,v 1.15 2004/03/16 02:56:27 takata Exp $ */
-
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/smp.h>
@@ -345,5 +343,5 @@
  
 #endif  /* CONFIG_MMU */
  
-.end
+	.end
 #ifndef _ASM_M32R_A_OUT_H
 #define _ASM_M32R_A_OUT_H
  
-/* orig : i386 2.4.18 */
-
 struct exec
 {
   unsigned long a_info;		/* Use macros N_MAGIC, etc for access */
-/* $Id$ */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
 #ifndef _ASM_M32R_BUGS_H
 #define _ASM_M32R_BUGS_H
  
-/* $Id$ */
-
 /*
  * This is included by init/main.c to check for architecture-dependent bugs.
  *
 #ifndef _ASM_M32R_BYTEORDER_H
 #define _ASM_M32R_BYTEORDER_H
  
-/* $Id$ */
-
 #include <asm/types.h>
  
 #if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
 #ifndef _ASM_M32R_CACHE_H
 #define _ASM_M32R_CACHE_H
  
-/* $Id$ */
-
 /* L1 cache line size */
 #define L1_CACHE_SHIFT		4
 #define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)
 #ifndef _ASM_M32R_CURRENT_H
 #define _ASM_M32R_CURRENT_H
  
-/* $Id$ */
-
 #include <linux/thread_info.h>
  
 struct task_struct;
 #ifndef _ASM_M32R_DELAY_H
 #define _ASM_M32R_DELAY_H
  
-/* $Id$ */
-
 /*
  * Copyright (C) 1993 Linus Torvalds
  *
 #ifndef _ASM_M32R_DMA_H
 #define _ASM_M32R_DMA_H
  
-/* $Id$ */
-
 #include <asm/io.h>
  
 /*
 #ifndef _ASM_M32R_ERRNO_H
 #define _ASM_M32R_ERRNO_H
  
-/* $Id$ */
-
 #include <asm-generic/errno.h>
  
 #endif /* _ASM_M32R_ERRNO_H */
 #ifndef _ASM_M32R_IDE_H
 #define _ASM_M32R_IDE_H
  
-/* $Id$ */
-
 /*
  *  linux/include/asm-m32r/ide.h
  *
@@ -15,6 +13,7 @@
  
 #ifdef __KERNEL__
  
+#include <asm/m32r.h>
  
 #ifndef MAX_HWIFS
 # ifdef CONFIG_BLK_DEV_IDEPCI
@@ -23,9 +22,6 @@
 #define MAX_HWIFS	2
 # endif
 #endif
-
-#include <asm/m32r.h>
-
  
 #define IDE_ARCH_OBSOLETE_DEFAULTS
  
 #ifndef __ARCH_M32R_IOCTLS_H__
 #define __ARCH_M32R_IOCTLS_H__
  
-/* $Id$ */
-
-/* orig : i386 2.5.67 */
-
 #include <asm/ioctl.h>
  
 /* 0x54 is just a magic number to make these relatively unique ('T') */
 #ifndef _ASM_M32R_IPCBUF_H
 #define _ASM_M32R_IPCBUF_H
  
-/* $Id$ */
-
-/* orig : i386 2.4.18 */
-
 /*
  * The ipc64_perm structure for m32r architecture.
  * Note extra padding because this structure is passed back and forth
 #ifndef __M32R_KMAP_TYPES_H
 #define __M32R_KMAP_TYPES_H
  
-/* Dummy header just to define km_type. */
-
-
 #ifdef CONFIG_DEBUG_HIGHMEM
 # define D(n) __KM_FENCE_##n ,
 #else
+#ifndef _M32104UT_M32104UT_PLD_H
+#define _M32104UT_M32104UT_PLD_H
+
 /*
  * include/asm-m32r/m32104ut/m32104ut_pld.h
  *
@@ -12,10 +15,6 @@
  * this archive for more details.
  */
  
-#ifndef _M32104UT_M32104UT_PLD_H
-#define _M32104UT_M32104UT_PLD_H
-
-
 #if defined(CONFIG_PLAT_M32104UT)
 #define PLD_PLAT_BASE		0x02c00000
 #else
@@ -35,7 +34,7 @@
 #define __reg8
 #define __reg16
 #define __reg32
-#endif	/* __ASSEMBLY__ */
+#endif /* __ASSEMBLY__ */
  
 /* CFC */
 #define	PLD_CFRSTCR		__reg16(PLD_BASE + 0x0000)
@@ -159,5 +158,5 @@
 #define PLD_SCTXB		__reg16(PLD_BASE + 0x3800c)
 #define PLD_SCRXB		__reg16(PLD_BASE + 0x3800e)
  
-#endif	/* _M32104UT_M32104UT_PLD_H */
+#endif /* _M32104UT_M32104UT_PLD_H */
+#ifndef _M32700UT_M32700UT_LAN_H
+#define _M32700UT_M32700UT_LAN_H
+
 /*
  * include/asm-m32r/m32700ut/m32700ut_lan.h
  *
  
@@ -8,14 +11,8 @@
  * This file is subject to the terms and conditions of the GNU General
  * Public License.  See the file "COPYING" in the main directory of
  * this archive for more details.
- *
- * $Id$
  */
  
-#ifndef _M32700UT_M32700UT_LAN_H
-#define _M32700UT_M32700UT_LAN_H
-
-
 #ifndef __ASSEMBLY__
 /*
  * C functions use non-cache address.
@@ -23,7 +20,7 @@
 #define M32700UT_LAN_BASE	(0x10000000 /* + NONCACHE_OFFSET */)
 #else
 #define M32700UT_LAN_BASE	(0x10000000 + NONCACHE_OFFSET)
-#endif	/* __ASSEMBLY__ */
+#endif /* __ASSEMBLY__ */
  
 /* ICU
  *  ICUISTS:	status register
@@ -103,5 +100,5 @@
 #define PLDI2CSTS_BB		0x00000010
 #define PLDI2CSTS_NOACK		0x00000001	/* 0:ack, 1:noack */
  
-#endif	/* _M32700UT_M32700UT_LAN_H */
+#endif /* _M32700UT_M32700UT_LAN_H */
+#ifndef _M32700UT_M32700UT_LCD_H
+#define _M32700UT_M32700UT_LCD_H
+
 /*
  * include/asm-m32r/m32700ut/m32700ut_lcd.h
  *
  
@@ -8,14 +11,8 @@
  * This file is subject to the terms and conditions of the GNU General
  * Public License.  See the file "COPYING" in the main directory of
  * this archive for more details.
- *
- * $Id$
  */
  
-#ifndef _M32700UT_M32700UT_LCD_H
-#define _M32700UT_M32700UT_LCD_H
-
-
 #ifndef __ASSEMBLY__
 /*
  * C functions use non-cache address.
@@ -23,7 +20,7 @@
 #define M32700UT_LCD_BASE	(0x10000000 /* + NONCACHE_OFFSET */)
 #else
 #define M32700UT_LCD_BASE	(0x10000000 + NONCACHE_OFFSET)
-#endif	/* __ASSEMBLY__ */
+#endif /* __ASSEMBLY__ */
  
 /*
  * ICU
@@ -55,5 +52,5 @@
 #define M32700UT_LCD_ICUCR19	__reg16(M32700UT_LCD_BASE + 0x300036)
 #define M32700UT_LCD_ICUCR21	__reg16(M32700UT_LCD_BASE + 0x30003a)
  
-#endif	/* _M32700UT_M32700UT_LCD_H */
+#endif /* _M32700UT_M32700UT_LCD_H */
+#ifndef _M32700UT_M32700UT_PLD_H
+#define _M32700UT_M32700UT_PLD_H
+
 /*
  * include/asm-m32r/m32700ut/m32700ut_pld.h
  *
  
@@ -8,14 +11,8 @@
  * This file is subject to the terms and conditions of the GNU General
  * Public License.  See the file "COPYING" in the main directory of
  * this archive for more details.
- *
- * $Id$
  */
  
-#ifndef _M32700UT_M32700UT_PLD_H
-#define _M32700UT_M32700UT_PLD_H
-
-
 #if defined(CONFIG_PLAT_M32700UT_Alpha)
 #define PLD_PLAT_BASE		0x08c00000
 #elif defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV)
@@ -37,7 +34,7 @@
 #define __reg8
 #define __reg16
 #define __reg32
-#endif	/* __ASSEMBLY__ */
+#endif /* __ASSEMBLY__ */
  
 /* CFC */
 #define	PLD_CFRSTCR		__reg16(PLD_BASE + 0x0000)
@@ -261,5 +258,5 @@
 #define PLD_SCTXB		__reg16(PLD_BASE + 0x3800c)
 #define PLD_SCRXB		__reg16(PLD_BASE + 0x3800e)
  
-#endif	/* _M32700UT_M32700UT_PLD.H */
+#endif /* _M32700UT_M32700UT_PLD.H */
+#ifndef _MAPPI2_PLD_H
+#define _MAPPI2_PLD_H
+
 /*
  * include/asm-m32r/mappi2/mappi2_pld.h
  *
  * Definitions for Extended IO Logic on MAPPI2 board.
- *  based on m32700ut_pld.h by
+ *  based on m32700ut_pld.h
  *
  * This file is subject to the terms and conditions of the GNU General
  * Public License.  See the file "COPYING" in the main directory of
  * this archive for more details.
- *
  */
  
-#ifndef _MAPPI2_PLD_H
-#define _MAPPI2_PLD_H
-
 #ifndef __ASSEMBLY__
 /* FIXME:
  * Some C functions use non-cache address, so can't define non-cache address.
@@ -26,7 +25,7 @@
 #define __reg8
 #define __reg16
 #define __reg32
-#endif	/* __ASSEMBLY__ */
+#endif /* __ASSEMBLY__ */
  
 /* CFC */
 #define	PLD_CFRSTCR		__reg16(PLD_BASE + 0x0000)
@@ -148,5 +147,5 @@
  
 #endif
  
-#endif	/* _MAPPI2_PLD.H */
+#endif /* _MAPPI2_PLD.H */
+#ifndef _MAPPI3_PLD_H
+#define _MAPPI3_PLD_H
+
 /*
  * include/asm-m32r/mappi3/mappi3_pld.h
  *
  
@@ -7,12 +10,8 @@
  * This file is subject to the terms and conditions of the GNU General
  * Public License.  See the file "COPYING" in the main directory of
  * this archive for more details.
- *
  */
  
-#ifndef _MAPPI3_PLD_H
-#define _MAPPI3_PLD_H
-
 #ifndef __ASSEMBLY__
 /* FIXME:
  * Some C functions use non-cache address, so can't define non-cache address.
@@ -26,7 +25,7 @@
 #define __reg8
 #define __reg16
 #define __reg32
-#endif	/* __ASSEMBLY__ */
+#endif /* __ASSEMBLY__ */
  
 /* CFC */
 #define	PLD_CFRSTCR		__reg16(PLD_BASE + 0x0000)
@@ -140,5 +139,5 @@
 /* Reset Control */
 #define PLD_REBOOT		__reg16(PLD_BASE + 0x38000)
  
-#endif	/* _MAPPI3_PLD.H */
+#endif /* _MAPPI3_PLD.H */
@@ -7,7 +7,6 @@
 #include <asm/io.h>
  
 #ifndef RTC_PORT
-// #define RTC_PORT(x)	(0x70 + (x))
 #define RTC_PORT(x)	((x))
 #define RTC_ALWAYS_BCD	1	/* RTC operates in binary mode */
 #endif
@@ -26,8 +25,6 @@
 })
  
 #define RTC_IRQ 8
-#if 0
-#endif
  
 #endif /* _ASM_MC146818RTC_H */
@@ -3,8 +3,6 @@
  
 #include <asm-generic/mman.h>
  
-/* orig : i386 2.6.0-test6 */
-
 #define MAP_GROWSDOWN	0x0100		/* stack-like segment */
 #define MAP_DENYWRITE	0x0800		/* ETXTBSY */
 #define MAP_EXECUTABLE	0x1000		/* mark it as an executable */
 #ifndef _ASM_M32R_MMU_H
 #define _ASM_M32R_MMU_H
  
-
 #if !defined(CONFIG_MMU)
+
 typedef struct {
 	struct vm_list_struct	*vmlist;
 	unsigned long		end_brk;
 } mm_context_t;
-#else
  
+#else /* CONFIG_MMU */
+
 /* Default "unsigned long" context */
 #ifndef CONFIG_SMP
 typedef unsigned long mm_context_t;
@@ -16,6 +17,7 @@
 typedef unsigned long mm_context_t[NR_CPUS];
 #endif
  
-#endif  /* CONFIG_MMU */
-#endif  /* _ASM_M32R_MMU_H */
+#endif /* CONFIG_MMU */
+
+#endif /* _ASM_M32R_MMU_H */
 #ifndef _ASM_M32R_MMU_CONTEXT_H
 #define _ASM_M32R_MMU_CONTEXT_H
-
 #ifdef __KERNEL__
  
-
 #include <asm/m32r.h>
  
 #define MMU_CONTEXT_ASID_MASK      (0x000000FF)
@@ -11,7 +9,6 @@
 #define MMU_CONTEXT_FIRST_VERSION  (0x00000100)
 #define NO_CONTEXT                 (0x00000000)
  
-
 #ifndef __ASSEMBLY__
  
 #include <asm/atomic.h>
@@ -147,7 +144,7 @@
 #define activate_mm(prev, next)	\
 	switch_mm((prev), (next), NULL)
  
-#else
+#else /* not CONFIG_MMU */
 #define get_mmu_context(mm)             do { } while (0)
 #define init_new_context(tsk,mm)        (0)
 #define destroy_context(mm)             do { } while (0)
  
  
@@ -158,12 +155,10 @@
 #define deactivate_mm(mm,tsk)           do { } while (0)
 #define activate_mm(prev,next)          do { } while (0)
 #define enter_lazy_tlb(mm,tsk)          do { } while (0)
-#endif /* CONFIG_MMU */
+#endif /* not CONFIG_MMU */
  
-
 #endif /* not __ASSEMBLY__ */
  
 #endif /* __KERNEL__ */
-
 #endif /* _ASM_M32R_MMU_CONTEXT_H */
 #ifndef _ASM_M32R_MODULE_H
 #define _ASM_M32R_MODULE_H
  
-/* $Id$ */
-
 struct mod_arch_specific { };
  
 #define Elf_Shdr	Elf32_Shdr
 #ifndef _ASM_M32R_MSGBUF_H
 #define _ASM_M32R_MSGBUF_H
  
-/* $Id$ */
-
-/* orig : i386 2.4.18 */
-
 /*
  * The msqid64_ds structure for m32r architecture.
  * Note extra padding because this structure is passed back and forth
 #ifndef _ASM_M32R_NAMEI_H
 #define _ASM_M32R_NAMEI_H
  
-/* $Id$ */
-
-/* orig : i386 2.4.18 */
-
 /*
  * linux/include/asm-m32r/namei.h
  *
+#ifndef _OPSPUT_OPSPUT_LAN_H
+#define _OPSPUT_OPSPUT_LAN_H
+
 /*
  * include/asm-m32r/opsput/opsput_lan.h
  *
  
@@ -8,14 +11,8 @@
  * This file is subject to the terms and conditions of the GNU General
  * Public License.  See the file "COPYING" in the main directory of
  * this archive for more details.
- *
- * $Id: opsput_lan.h,v 1.1 2004/07/27 06:54:20 sakugawa Exp $
  */
  
-#ifndef _OPSPUT_OPSPUT_LAN_H
-#define _OPSPUT_OPSPUT_LAN_H
-
-
 #ifndef __ASSEMBLY__
 /*
  * C functions use non-cache address.
@@ -23,7 +20,7 @@
 #define OPSPUT_LAN_BASE	(0x10000000 /* + NONCACHE_OFFSET */)
 #else
 #define OPSPUT_LAN_BASE	(0x10000000 + NONCACHE_OFFSET)
-#endif	/* __ASSEMBLY__ */
+#endif /* __ASSEMBLY__ */
  
 /* ICU
  *  ICUISTS:	status register
@@ -52,5 +49,5 @@
 #define OPSPUT_LAN_ICUCR1	__reg16(OPSPUT_LAN_BASE + 0xc0010)
 #define OPSPUT_LAN_ICUCR3	__reg16(OPSPUT_LAN_BASE + 0xc0014)
  
-#endif	/* _OPSPUT_OPSPUT_LAN_H */
+#endif /* _OPSPUT_OPSPUT_LAN_H */
+#ifndef _OPSPUT_OPSPUT_LCD_H
+#define _OPSPUT_OPSPUT_LCD_H
+
 /*
  * include/asm-m32r/opsput/opsput_lcd.h
  *
  
@@ -8,14 +11,8 @@
  * This file is subject to the terms and conditions of the GNU General
  * Public License.  See the file "COPYING" in the main directory of
  * this archive for more details.
- *
- * $Id: opsput_lcd.h,v 1.1 2004/07/27 06:54:20 sakugawa Exp $
  */
  
-#ifndef _OPSPUT_OPSPUT_LCD_H
-#define _OPSPUT_OPSPUT_LCD_H
-
-
 #ifndef __ASSEMBLY__
 /*
  * C functions use non-cache address.
@@ -23,7 +20,7 @@
 #define OPSPUT_LCD_BASE	(0x10000000 /* + NONCACHE_OFFSET */)
 #else
 #define OPSPUT_LCD_BASE	(0x10000000 + NONCACHE_OFFSET)
-#endif	/* __ASSEMBLY__ */
+#endif /* __ASSEMBLY__ */
  
 /*
  * ICU
@@ -55,5 +52,5 @@
 #define OPSPUT_LCD_ICUCR19	__reg16(OPSPUT_LCD_BASE + 0x300036)
 #define OPSPUT_LCD_ICUCR21	__reg16(OPSPUT_LCD_BASE + 0x30003a)
  
-#endif	/* _OPSPUT_OPSPUT_LCD_H */
+#endif /* _OPSPUT_OPSPUT_LCD_H */
+#ifndef _OPSPUT_OPSPUT_PLD_H
+#define _OPSPUT_OPSPUT_PLD_H
+
 /*
  * include/asm-m32r/opsput/opsput_pld.h
  *
  
@@ -8,14 +11,8 @@
  * This file is subject to the terms and conditions of the GNU General
  * Public License.  See the file "COPYING" in the main directory of
  * this archive for more details.
- *
- * $Id: opsput_pld.h,v 1.1 2004/07/27 06:54:20 sakugawa Exp $
  */
  
-#ifndef _OPSPUT_OPSPUT_PLD_H
-#define _OPSPUT_OPSPUT_PLD_H
-
-
 #define PLD_PLAT_BASE		0x1cc00000
  
 #ifndef __ASSEMBLY__
@@ -31,7 +28,7 @@
 #define __reg8
 #define __reg16
 #define __reg32
-#endif	/* __ASSEMBLY__ */
+#endif /* __ASSEMBLY__ */
  
 /* CFC */
 #define	PLD_CFRSTCR		__reg16(PLD_BASE + 0x0000)
@@ -255,5 +252,5 @@
 #define PLD_SCTXB		__reg16(PLD_BASE + 0x3800c)
 #define PLD_SCRXB		__reg16(PLD_BASE + 0x3800e)
  
-#endif	/* _OPSPUT_OPSPUT_PLD.H */
+#endif /* _OPSPUT_OPSPUT_PLD.H */
 #ifndef _ASM_M32R_PAGE_H
 #define _ASM_M32R_PAGE_H
  
-
 /* PAGE_SHIFT determines the page size */
 #define PAGE_SHIFT	12
 #define PAGE_SIZE	(1UL << PAGE_SHIFT)
@@ -56,9 +55,6 @@
  * If you want more physical memory than this then see the CONFIG_HIGHMEM4G
  * and CONFIG_HIGHMEM64G options in the kernel configuration.
  */
-
-
-/* This handles the memory map.. */
  
 #define __MEMORY_START  CONFIG_MEMORY_START
 #define __MEMORY_SIZE   CONFIG_MEMORY_SIZE
 #ifndef _ASM_M32R_PARAM_H
 #define _ASM_M32R_PARAM_H
  
-/* $Id$ */
-
-/* orig : i386 2.5.67 */
-
 #ifdef __KERNEL__
 # define HZ		100		/* Internal kernel timer frequency */
 # define USER_HZ	100		/* .. some user interfaces are in "ticks" */
 #ifndef _ASM_M32R_PCI_H
 #define _ASM_M32R_PCI_H
  
-/* $Id$ */
-
 #include <asm-generic/pci.h>
  
 #define PCI_DMA_BUS_IS_PHYS	(1)
 #ifndef _ASM_M32R_PGALLOC_H
 #define _ASM_M32R_PGALLOC_H
  
-/* $Id$ */
-
 #include <linux/mm.h>
  
 #include <asm/io.h>
 #ifndef _ASM_M32R_PGTABLE_2LEVEL_H
 #define _ASM_M32R_PGTABLE_2LEVEL_H
-
 #ifdef __KERNEL__
  
-
 /*
  * traditional M32R two-level paging structure:
  */
@@ -77,6 +75,5 @@
 #define pgoff_to_pte(off)	((pte_t) { (((off) & 0xef) << 2) | (((off) >> 7) << 10) | _PAGE_FILE })
  
 #endif /* __KERNEL__ */
-
 #endif /* _ASM_M32R_PGTABLE_2LEVEL_H */
 #ifndef _ASM_M32R_POSIX_TYPES_H
 #define _ASM_M32R_POSIX_TYPES_H
  
-/* $Id$ */
-
-/* orig : i386, sh 2.4.18 */
-
 /*
  * This file is generally used by user-level software, so you need to
  * be a little careful about namespace pollution etc.  Also, we cannot
-/* $Id: rtc.h,v 1.1.1.1 2004/03/25 04:29:22 hitoshiy Exp $ */
-
 #ifndef __RTC_H__
 #define __RTC_H__
-
-
  
    /* Dallas DS1302 clock/calendar register numbers. */
 #  define RTC_SECONDS      0
 #ifndef _ASM_M32R_SCATTERLIST_H
 #define _ASM_M32R_SCATTERLIST_H
  
-/* $Id$ */
-
 struct scatterlist {
     char *  address;    /* Location data is to be transferred to, NULL for
                          * highmem page */
 #ifndef _ASM_M32R_SEGMENT_H
 #define _ASM_M32R_SEGMENT_H
  
-/* $Id$ */
-
-/* orig : i386 (2.4.18) */
-
 #define __KERNEL_CS	0x10
 #define __KERNEL_DS	0x18
  
 #ifndef _ASM_M32R_SEMBUF_H
 #define _ASM_M32R_SEMBUF_H
  
-/* $Id$ */
-
-/* orig : i386 2.4.18 */
-
 /*
  * The semid64_ds structure for m32r architecture.
  * Note extra padding because this structure is passed back and forth
+#ifndef _ASM_M32R_SETUP_H
+#define _ASM_M32R_SETUP_H
+
 /*
  * This is set up by the setup-routine at boot-time
  */
@@ -31,4 +34,6 @@
 extern unsigned long memory_end;
  
 #endif  /*  __KERNEL__  */
+
+#endif /* _ASM_M32R_SETUP_H */
 #ifndef _ASM_M32R_SHMBUF_H
 #define _ASM_M32R_SHMBUF_H
  
-/* $Id$ */
-
-/* orig : i386 2.4.18 */
-
 /*
  * The shmid64_ds structure for M32R architecture.
  * Note extra padding because this structure is passed back and forth
 #ifndef _ASM_M32R_SHMPARAM_H
 #define _ASM_M32R_SHMPARAM_H
  
-/* $Id$ */
-
 #define	SHMLBA PAGE_SIZE		 /* attach addr a multiple of this */
  
 #endif /* _ASM_M32R_SHMPARAM_H */
 #ifndef _ASM_M32R_SIGCONTEXT_H
 #define _ASM_M32R_SIGCONTEXT_H
  
-/* $Id$ */
-
-
 struct sigcontext {
 	/* CPU registers */
 	/* Saved main processor registers. */
 #ifndef _M32R_SIGINFO_H
 #define _M32R_SIGINFO_H
  
-/* $Id$ */
-
 #include <asm-generic/siginfo.h>
  
 #endif /* _M32R_SIGINFO_H */
 #ifndef _ASM_M32R_SIGNAL_H
 #define _ASM_M32R_SIGNAL_H
  
-/* $Id$ */
-
-/* orig : i386 2.4.18 */
-
 #include <linux/types.h>
 #include <linux/time.h>
 #include <linux/compiler.h>
 #ifndef _ASM_M32R_SMP_H
 #define _ASM_M32R_SMP_H
  
-/* $Id$ */
-
-
 #ifdef CONFIG_SMP
 #ifndef __ASSEMBLY__
  
 #ifndef _ASM_M32R_SOCKIOS_H
 #define _ASM_M32R_SOCKIOS_H
  
-/* $Id$ */
-
 /* Socket-level I/O control calls. */
 #define FIOSETOWN 	0x8901
 #define SIOCSPGRP	0x8902
@@ -20,5 +20,5 @@
  
 #define __RAW_RW_LOCK_UNLOCKED		{ RW_LOCK_BIAS }
  
-#endif
+#endif /* _ASM_M32R_SPINLOCK_TYPES_H */
 #ifndef _ASM_M32R_STAT_H
 #define _ASM_M32R_STAT_H
  
-/* $Id$ */
-
-/* orig : i386 2.4.18 */
-
 #include <asm/byteorder.h>
  
 struct __old_kernel_stat {
 #ifndef _ASM_M32R_STRING_H
 #define _ASM_M32R_STRING_H
  
-/* $Id$ */
-
 #define  __HAVE_ARCH_STRLEN
 extern size_t strlen(const char * s);
  
 #ifndef _ASM_M32R_SYSCALL_H
 #define _ASM_M32R_SYSCALL_H
  
-/* $Id$ */
-
 /* Definitions for the system call vector.  */
 #define SYSCALL_VECTOR          "2"
 #define SYSCALL_VECTOR_ADDRESS  "0xa0"
@@ -339,5 +339,5 @@
  
 #define arch_align_stack(x) (x)
  
-#endif  /* _ASM_M32R_SYSTEM_H */
+#endif /* _ASM_M32R_SYSTEM_H */
 #ifndef _ASM_M32R_TERMBITS_H
 #define _ASM_M32R_TERMBITS_H
  
-/* $Id$ */
-
 #include <linux/posix_types.h>
  
 typedef unsigned char	cc_t;
@@ -184,5 +182,5 @@
 #define	TCSADRAIN	1
 #define	TCSAFLUSH	2
  
-#endif  /* _ASM_M32R_TERMBITS_H */
+#endif /* _ASM_M32R_TERMBITS_H */
 #ifndef _M32R_TERMIOS_H
 #define _M32R_TERMIOS_H
  
-/* orig : i386 2.6.0-test5 */
-
 #include <asm/termbits.h>
 #include <asm/ioctls.h>
  
 #ifndef _ASM_M32R_TIMEX_H
 #define _ASM_M32R_TIMEX_H
  
-/* $Id$ */
-
 /*
  * linux/include/asm-m32r/timex.h
  *
  * m32r architecture timex specifications
  */
-
  
 #define CLOCK_TICK_RATE	(CONFIG_BUS_CLOCK / CONFIG_TIMER_DIVIDE)
 #define CLOCK_TICK_FACTOR	20	/* Factor of both 1000000 and CLOCK_TICK_RATE */
@@ -3,10 +3,6 @@
  
 #ifndef __ASSEMBLY__
  
-/* $Id$ */
-
-/* orig : i386 2.4.18 */
-
 typedef unsigned short umode_t;
  
 /*
@@ -59,5 +55,5 @@
  
 #endif /* __KERNEL__ */
  
-#endif  /* _ASM_M32R_TYPES_H */
+#endif /* _ASM_M32R_TYPES_H */
 #ifndef _ASM_M32R_UCONTEXT_H
 #define _ASM_M32R_UCONTEXT_H
  
-/* orig : i386 2.4.18 */
-
 struct ucontext {
 	unsigned long	  uc_flags;
 	struct ucontext  *uc_link;
 #ifndef _ASM_M32R_UNALIGNED_H
 #define _ASM_M32R_UNALIGNED_H
  
-/* $Id$ */
-
-/* orig : generic 2.4.18 */
-
 /*
  * For the benefit of those who are trying to port Linux to another
  * architecture, here are some C-language equivalents.
@@ -12,7 +8,6 @@
  
 #include <asm/string.h>
  
-
 #define get_unaligned(ptr) \
   ({ __typeof__(*(ptr)) __tmp; memmove(&__tmp, (ptr), sizeof(*(ptr))); __tmp; })
  
@@ -21,6 +16,5 @@
      memmove((ptr), &__tmp, sizeof(*(ptr)));		\
      (void)0; })
  
-
-#endif  /* _ASM_M32R_UNALIGNED_H */
+#endif /* _ASM_M32R_UNALIGNED_H */
 #ifndef _ASM_M32R_UNISTD_H
 #define _ASM_M32R_UNISTD_H
  
-/* $Id$ */
-
 /*
  * This file contains the system call numbers.
  */
 #ifndef _ASM_M32R_USER_H
 #define _ASM_M32R_USER_H
  
-/* $Id$ */
-
-/* orig : sh 2.4.18
- * mod  : remove fpu registers
- */
-
 #include <linux/types.h>
 #include <asm/ptrace.h>
 #include <asm/page.h>
 #ifndef _ASM_M32R_VGA_H
 #define _ASM_M32R_VGA_H
  
-/* $Id$ */
-
 /*
  *	Access to VGA videoram
  *
@@ -19,5 +17,5 @@
 #define vga_readb(x) (*(x))
 #define vga_writeb(x,y) (*(y) = (x))
  
-#endif  /* _ASM_M32R_VGA_H */
+#endif /* _ASM_M32R_VGA_H */
 #ifndef _ASM_M32R_XOR_H
 #define _ASM_M32R_XOR_H
  
-/* $Id$ */
-
 #include <asm-generic/xor.h>
  
 #endif  /* _ASM_M32R_XOR_H */
...	...	@@ -7,8 +7,6 @@
7	7	* Hitoshi Yamamoto
8	8	*/
9	9
10		-/* $Id$ */
11		-
12	10	#include <linux/init.h>
13	11	__INIT
14	12	__INITDATA
...	...	@@ -4,8 +4,6 @@
4	4	* Copyright (C) 2001,2002 Hiroyuki Kondo, and Hirokazu Takata
5	5	*
6	6	*/
7		-/* $Id$ */
8		-
9	7
10	8	;
11	9	; input (r0,r1) src
...	...	@@ -25,9 +25,7 @@
25	25	* as published by the Free Software Foundation; either version
26	26	* 2 of the License, or (at your option) any later version.
27	27	*/
28		-/* $Id$ */
29	28
30		-
31	29	#include <linux/linkage.h>
32	30	#include <asm/assembler.h>
33	31	#include <asm/errno.h>
...	...	@@ -318,4 +316,6 @@
318	316	nop
319	317	nop
320	318	nop
	319	+
	320	+ .end
...	...	@@ -5,8 +5,6 @@
5	5	* Copyright (c) 2004 Hirokazu Takata
6	6	*/
7	7
8		-/* $Id$ */
9		-
10	8	#include <linux/param.h>
11	9	#ifdef CONFIG_SMP
12	10	#include <linux/sched.h>
...	...	@@ -10,8 +10,6 @@
10	10	* src: r1
11	11	* n : r2
12	12	*/
13		-/* $Id$ */
14		-
15	13
16	14	.text
17	15	#include <linux/linkage.h>
...	...	@@ -12,8 +12,6 @@
12	12	* ret: r0
13	13	*
14	14	*/
15		-/* $Id$ */
16		-
17	15
18	16	.text
19	17	.global memset
...	...	@@ -6,8 +6,6 @@
6	6	* size_t strlen(const char *s);
7	7	*
8	8	*/
9		-/* $Id$ */
10		-
11	9
12	10	#include <linux/linkage.h>
13	11	#include <asm/assembler.h>
...	...	@@ -7,8 +7,6 @@
7	7	* Copyright (C) 1995 Linus Torvalds
8	8	*/
9	9
10		-/* $Id: fault-nommu.c,v 1.1 2004/03/30 06:40:59 sakugawa Exp $ */
11		-
12	10	#include <linux/signal.h>
13	11	#include <linux/sched.h>
14	12	#include <linux/kernel.h>
...	...	@@ -67,7 +65,7 @@
67	65	* without oops_in_progress set so that printk will give klogd
68	66	* a poke. Hold onto your hats...
69	67	*/
70		- console_loglevel = 15; /* NMI oopser may have shut the console up */
	68	+ console_loglevel = 15; /* NMI oopser may have shut the console up */
71	69	printk(" ");
72	70	console_loglevel = loglevel_save;
73	71	}
...	...	@@ -4,8 +4,6 @@
4	4	* Copyright (C) 2001 by Hiroyuki Kondo
5	5	*/
6	6
7		-/* $Id: mmu.S,v 1.15 2004/03/16 02:56:27 takata Exp $ */
8		-
9	7	#include <linux/linkage.h>
10	8	#include <asm/assembler.h>
11	9	#include <asm/smp.h>
...	...	@@ -345,5 +343,5 @@
345	343
346	344	#endif /* CONFIG_MMU */
347	345
348		-.end
	346	+ .end
1	1	#ifndef _ASM_M32R_A_OUT_H
2	2	#define _ASM_M32R_A_OUT_H
3	3
4		-/* orig : i386 2.4.18 */
5		-
6	4	struct exec
7	5	{
8	6	unsigned long a_info; /* Use macros N_MAGIC, etc for access */