x86: remove more bogus filenames in comments.

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/include/asm-x86/acpi_32.h b/include/asm-x86/acpi_32.h
index 3cce5a0f2d9c5820572022f5b6be29bb2ac9ad11..c8afeea0b80b6a799b2cb07a02b2127473a0532e 100644 (file)
--- a/include/asm-x86/acpi_32.h
+++ b/include/asm-x86/acpi_32.h
@@ -1,9 +1,7 @@
 /*
- *  asm-i386/acpi.h
- *
  *  Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
  *  Copyright (C) 2001 Patrick Mochel <mochel@osdl.org>
-  *
+ *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
  *  This program is free software; you can redistribute it and/or modify

diff --git a/include/asm-x86/acpi_64.h b/include/asm-x86/acpi_64.h
index 98173357dd89c4d6291cd2d0400bace25022adbd..58114ed08024343d3a697e4c215d01120054743f 100644 (file)
--- a/include/asm-x86/acpi_64.h
+++ b/include/asm-x86/acpi_64.h
@@ -1,9 +1,7 @@
 /*
- *  asm-x86_64/acpi.h
- *
  *  Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
  *  Copyright (C) 2001 Patrick Mochel <mochel@osdl.org>
-  *
+ *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
  *  This program is free software; you can redistribute it and/or modify

diff --git a/include/asm-x86/checksum_64.h b/include/asm-x86/checksum_64.h
index 419fe88a0342d383962571165f2e2ec04f4d23d3..e5f79997decce1c2635b77301968594bebba0449 100644 (file)
--- a/include/asm-x86/checksum_64.h
+++ b/include/asm-x86/checksum_64.h
@@ -4,7 +4,7 @@
 /* 
  * Checksums for x86-64 
  * Copyright 2002 by Andi Kleen, SuSE Labs 
- * with some code from asm-i386/checksum.h
+ * with some code from asm-x86/checksum.h
  */ 
 
 #include <linux/compiler.h>

diff --git a/include/asm-x86/i387_32.h b/include/asm-x86/i387_32.h
index cdd1e248e3b409529747c7bcd0b68ea032497e5e..9ac2502cdd3d30d0ee0f8fe8861f8aba307d7862 100644 (file)
--- a/include/asm-x86/i387_32.h
+++ b/include/asm-x86/i387_32.h
@@ -1,6 +1,4 @@
 /*
- * include/asm-i386/i387.h
- *
  * Copyright (C) 1994 Linus Torvalds
  *
  * Pentium III FXSR, SSE support

diff --git a/include/asm-x86/i387_64.h b/include/asm-x86/i387_64.h
index 3a4ffba3d6bcf2c30bbad9e6cd7f87cce8a165ba..12edb9f2d755b18d3dd80300c347c11643aa61c9 100644 (file)
--- a/include/asm-x86/i387_64.h
+++ b/include/asm-x86/i387_64.h
@@ -1,6 +1,4 @@
 /*
- * include/asm-x86_64/i387.h
- *
  * Copyright (C) 1994 Linus Torvalds
  *
  * Pentium III FXSR, SSE support

diff --git a/include/asm-x86/ia32_unistd.h b/include/asm-x86/ia32_unistd.h
index 5b52ce5073383606db7b14c08d90136975bf69cd..61cea9e7c5c1b499dc67395b3d61ea18d54fee3f 100644 (file)
--- a/include/asm-x86/ia32_unistd.h
+++ b/include/asm-x86/ia32_unistd.h
@@ -5,7 +5,7 @@
  * This file contains the system call numbers of the ia32 port,
  * this is for the kernel only.
  * Only add syscalls here where some part of the kernel needs to know
- * the number. This should be otherwise in sync with asm-i386/unistd.h. -AK
+ * the number. This should be otherwise in sync with asm-x86/unistd_32.h. -AK
  */
 
 #define __NR_ia32_restart_syscall 0

diff --git a/include/asm-x86/ide.h b/include/asm-x86/ide.h
index 42130adf9c7c36ce71a0e1d71da21b089974992a..c2552d8bebf7b78abadef71fdcc92836228f472b 100644 (file)
--- a/include/asm-x86/ide.h
+++ b/include/asm-x86/ide.h
@@ -1,6 +1,4 @@
 /*
- *  linux/include/asm-i386/ide.h
- *
  *  Copyright (C) 1994-1996  Linus Torvalds & authors
  */
 

diff --git a/include/asm-x86/irqflags_32.h b/include/asm-x86/irqflags_32.h
index 4c7720089cb5cd68d1d26af4171dcf6f1518226a..98b21b9bdce884ea2c245212310a47e488c7b159 100644 (file)
--- a/include/asm-x86/irqflags_32.h
+++ b/include/asm-x86/irqflags_32.h
@@ -1,6 +1,4 @@
 /*
- * include/asm-i386/irqflags.h
- *
  * IRQ flags handling
  *
  * This file gets included from lowlevel asm headers too, to provide

diff --git a/include/asm-x86/irqflags_64.h b/include/asm-x86/irqflags_64.h
index bb9163bb29d1d914651ac672e062b5229a31be6d..38c07db733cf824e202895de3591748272f0c5ca 100644 (file)
--- a/include/asm-x86/irqflags_64.h
+++ b/include/asm-x86/irqflags_64.h
@@ -1,6 +1,4 @@
 /*
- * include/asm-x86_64/irqflags.h
- *
  * IRQ flags handling
  *
  * This file gets included from lowlevel asm headers too, to provide

diff --git a/include/asm-x86/mach-default/apm.h b/include/asm-x86/mach-default/apm.h
index 1f730b8bd1fd463af3d02d714812b7933703e261..989f34c37d321249f838efe86d4e9c2086b42233 100644 (file)
--- a/include/asm-x86/mach-default/apm.h
+++ b/include/asm-x86/mach-default/apm.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-i386/mach-default/apm.h
- *
  *  Machine specific APM BIOS functions for generic.
  *  Split out from apm.c by Osamu Tomita <tomita@cinet.co.jp>
  */

diff --git a/include/asm-x86/mach-default/mach_timer.h b/include/asm-x86/mach-default/mach_timer.h
index 807992fd4171b78fe9d86287706e590f9d11deb2..4b76e536cd986307b071c8c11d2bff4c30b4112f 100644 (file)
--- a/include/asm-x86/mach-default/mach_timer.h
+++ b/include/asm-x86/mach-default/mach_timer.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-i386/mach-default/mach_timer.h
- *
  *  Machine specific calibrate_tsc() for generic.
  *  Split out from timer_tsc.c by Osamu Tomita <tomita@cinet.co.jp>
  */

diff --git a/include/asm-x86/mach-default/mach_traps.h b/include/asm-x86/mach-default/mach_traps.h
index 625438b8a6eb485a52e7df429e315a653b33d8b7..2fe7705c0484ed074a5d0b2f9e2bf7acc88cd7cf 100644 (file)
--- a/include/asm-x86/mach-default/mach_traps.h
+++ b/include/asm-x86/mach-default/mach_traps.h
@@ -1,6 +1,4 @@
 /*
- *  include/asm-i386/mach-default/mach_traps.h
- *
  *  Machine specific NMI handling for generic.
  *  Split out from traps.c by Osamu Tomita <tomita@cinet.co.jp>
  */

diff --git a/include/asm-x86/nmi_32.h b/include/asm-x86/nmi_32.h
index 70a958a8e3816f738558ca33b00a49d3e14cd3a0..7206c7e8a38813a858540742ee57e54d1a54b3e5 100644 (file)
--- a/include/asm-x86/nmi_32.h
+++ b/include/asm-x86/nmi_32.h
@@ -1,6 +1,3 @@
-/*
- *  linux/include/asm-i386/nmi.h
- */
 #ifndef ASM_NMI_H
 #define ASM_NMI_H
 

diff --git a/include/asm-x86/nmi_64.h b/include/asm-x86/nmi_64.h
index 65b6acf3bb593af5edd4460d9a8bd3cdb32ff924..92f36fb1dc621d1ea482313f842f2bb1d676b89e 100644 (file)
--- a/include/asm-x86/nmi_64.h
+++ b/include/asm-x86/nmi_64.h
@@ -1,6 +1,3 @@
-/*
- *  linux/include/asm-i386/nmi.h
- */
 #ifndef ASM_NMI_H
 #define ASM_NMI_H
 

diff --git a/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h
index 58880a1ddd651483fa994fb212c163e0d2f8bfad..3b51a18f16d5d57fecbb5e19905da4d9e246265c 100644 (file)
--- a/include/asm-x86/processor_32.h
+++ b/include/asm-x86/processor_32.h
@@ -1,6 +1,4 @@
 /*
- * include/asm-i386/processor.h
- *
  * Copyright (C) 1994 Linus Torvalds
  */
 

diff --git a/include/asm-x86/processor_64.h b/include/asm-x86/processor_64.h
index 6b96e1f12a42ed0f933b16b478c850bcf5d00414..6c0d96a7af637d5dce96287c186e783564b1a3e4 100644 (file)
--- a/include/asm-x86/processor_64.h
+++ b/include/asm-x86/processor_64.h
@@ -1,6 +1,4 @@
 /*
- * include/asm-x86_64/processor.h
- *
  * Copyright (C) 1994 Linus Torvalds
  */
 

diff --git a/include/asm-x86/rio.h b/include/asm-x86/rio.h
index c7350f6d20158302e2b89609c24084a25f140eba..97cdcc9887ba9246649215a5dfd457440f95b8f7 100644 (file)
--- a/include/asm-x86/rio.h
+++ b/include/asm-x86/rio.h
@@ -1,6 +1,6 @@
 /*
- * Derived from include/asm-i386/mach-summit/mach_mpparse.h
- *          and include/asm-i386/mach-default/bios_ebda.h
+ * Derived from include/asm-x86/mach-summit/mach_mpparse.h
+ *          and include/asm-x86/mach-default/bios_ebda.h
  *
  * Author: Laurent Vivier <Laurent.Vivier@bull.net>
  */

diff --git a/include/asm-x86/rwsem.h b/include/asm-x86/rwsem.h
index 041906f3c6df73375abda597ba38e63922ffb542..a7e7e14cb4307e722b11eab4299e65d9ef61dc28 100644 (file)
--- a/include/asm-x86/rwsem.h
+++ b/include/asm-x86/rwsem.h
@@ -2,7 +2,7 @@
  *
  * Written by David Howells (dhowells@redhat.com).
  *
- * Derived from asm-i386/semaphore.h
+ * Derived from asm-x86/semaphore.h
  *
  *
  * The MSW of the count is the negated number of active writers and waiting

diff --git a/include/asm-x86/topology_32.h b/include/asm-x86/topology_32.h
index 9040f5a612780ff4421838bc152d29cab0be4f72..fdca80a851e2da12e0dfc5a2b24ec82003733ffb 100644 (file)
--- a/include/asm-x86/topology_32.h
+++ b/include/asm-x86/topology_32.h
@@ -1,6 +1,4 @@
 /*
- * linux/include/asm-i386/topology.h
- *
  * Written by: Matthew Dobson, IBM Corporation
  *
  * Copyright (C) 2002, IBM Corp.

diff --git a/include/asm-x86/xor_32.h b/include/asm-x86/xor_32.h
index 23c86cef3b258a8611e765bd168e1c89054a19f6..a41ef1bdd424b36465df9a402f419759a606cf9c 100644 (file)
--- a/include/asm-x86/xor_32.h
+++ b/include/asm-x86/xor_32.h
@@ -1,6 +1,4 @@
 /*
- * include/asm-i386/xor.h
- *
  * Optimized RAID-5 checksumming functions for MMX and SSE.
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/include/asm-x86/xor_64.h b/include/asm-x86/xor_64.h
index f942fcc218312ec70d6eb9d1793ba43cd98ad355..1eee7fcb2420682f613eb7f2528a7056f38d7e04 100644 (file)
--- a/include/asm-x86/xor_64.h
+++ b/include/asm-x86/xor_64.h
@@ -1,6 +1,4 @@
 /*
- * include/asm-x86_64/xor.h
- *
  * Optimized RAID-5 checksumming functions for MMX and SSE.
  *
  * This program is free software; you can redistribute it and/or modify