diff options
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/acpi_32.h | 4 | ||||
-rw-r--r-- | include/asm-x86/acpi_64.h | 4 | ||||
-rw-r--r-- | include/asm-x86/checksum_64.h | 2 | ||||
-rw-r--r-- | include/asm-x86/i387_32.h | 2 | ||||
-rw-r--r-- | include/asm-x86/i387_64.h | 2 | ||||
-rw-r--r-- | include/asm-x86/ia32_unistd.h | 2 | ||||
-rw-r--r-- | include/asm-x86/ide.h | 2 | ||||
-rw-r--r-- | include/asm-x86/irqflags_32.h | 2 | ||||
-rw-r--r-- | include/asm-x86/irqflags_64.h | 2 | ||||
-rw-r--r-- | include/asm-x86/mach-default/apm.h | 2 | ||||
-rw-r--r-- | include/asm-x86/mach-default/mach_timer.h | 2 | ||||
-rw-r--r-- | include/asm-x86/mach-default/mach_traps.h | 2 | ||||
-rw-r--r-- | include/asm-x86/nmi_32.h | 3 | ||||
-rw-r--r-- | include/asm-x86/nmi_64.h | 3 | ||||
-rw-r--r-- | include/asm-x86/processor_32.h | 2 | ||||
-rw-r--r-- | include/asm-x86/processor_64.h | 2 | ||||
-rw-r--r-- | include/asm-x86/rio.h | 4 | ||||
-rw-r--r-- | include/asm-x86/rwsem.h | 2 | ||||
-rw-r--r-- | include/asm-x86/topology_32.h | 2 | ||||
-rw-r--r-- | include/asm-x86/xor_32.h | 2 | ||||
-rw-r--r-- | include/asm-x86/xor_64.h | 2 |
21 files changed, 7 insertions, 43 deletions
diff --git a/include/asm-x86/acpi_32.h b/include/asm-x86/acpi_32.h index 3cce5a0f2d9c..c8afeea0b80b 100644 --- a/include/asm-x86/acpi_32.h +++ b/include/asm-x86/acpi_32.h | |||
@@ -1,9 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * asm-i386/acpi.h | ||
3 | * | ||
4 | * Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com> | 2 | * Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com> |
5 | * Copyright (C) 2001 Patrick Mochel <mochel@osdl.org> | 3 | * Copyright (C) 2001 Patrick Mochel <mochel@osdl.org> |
6 | * | 4 | * |
7 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 5 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
8 | * | 6 | * |
9 | * This program is free software; you can redistribute it and/or modify | 7 | * 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 98173357dd89..58114ed08024 100644 --- a/include/asm-x86/acpi_64.h +++ b/include/asm-x86/acpi_64.h | |||
@@ -1,9 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * asm-x86_64/acpi.h | ||
3 | * | ||
4 | * Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com> | 2 | * Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com> |
5 | * Copyright (C) 2001 Patrick Mochel <mochel@osdl.org> | 3 | * Copyright (C) 2001 Patrick Mochel <mochel@osdl.org> |
6 | * | 4 | * |
7 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 5 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
8 | * | 6 | * |
9 | * This program is free software; you can redistribute it and/or modify | 7 | * 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 419fe88a0342..e5f79997decc 100644 --- a/include/asm-x86/checksum_64.h +++ b/include/asm-x86/checksum_64.h | |||
@@ -4,7 +4,7 @@ | |||
4 | /* | 4 | /* |
5 | * Checksums for x86-64 | 5 | * Checksums for x86-64 |
6 | * Copyright 2002 by Andi Kleen, SuSE Labs | 6 | * Copyright 2002 by Andi Kleen, SuSE Labs |
7 | * with some code from asm-i386/checksum.h | 7 | * with some code from asm-x86/checksum.h |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/compiler.h> | 10 | #include <linux/compiler.h> |
diff --git a/include/asm-x86/i387_32.h b/include/asm-x86/i387_32.h index cdd1e248e3b4..9ac2502cdd3d 100644 --- a/include/asm-x86/i387_32.h +++ b/include/asm-x86/i387_32.h | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-i386/i387.h | ||
3 | * | ||
4 | * Copyright (C) 1994 Linus Torvalds | 2 | * Copyright (C) 1994 Linus Torvalds |
5 | * | 3 | * |
6 | * Pentium III FXSR, SSE support | 4 | * Pentium III FXSR, SSE support |
diff --git a/include/asm-x86/i387_64.h b/include/asm-x86/i387_64.h index 3a4ffba3d6bc..12edb9f2d755 100644 --- a/include/asm-x86/i387_64.h +++ b/include/asm-x86/i387_64.h | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-x86_64/i387.h | ||
3 | * | ||
4 | * Copyright (C) 1994 Linus Torvalds | 2 | * Copyright (C) 1994 Linus Torvalds |
5 | * | 3 | * |
6 | * Pentium III FXSR, SSE support | 4 | * Pentium III FXSR, SSE support |
diff --git a/include/asm-x86/ia32_unistd.h b/include/asm-x86/ia32_unistd.h index 5b52ce507338..61cea9e7c5c1 100644 --- a/include/asm-x86/ia32_unistd.h +++ b/include/asm-x86/ia32_unistd.h | |||
@@ -5,7 +5,7 @@ | |||
5 | * This file contains the system call numbers of the ia32 port, | 5 | * This file contains the system call numbers of the ia32 port, |
6 | * this is for the kernel only. | 6 | * this is for the kernel only. |
7 | * Only add syscalls here where some part of the kernel needs to know | 7 | * Only add syscalls here where some part of the kernel needs to know |
8 | * the number. This should be otherwise in sync with asm-i386/unistd.h. -AK | 8 | * the number. This should be otherwise in sync with asm-x86/unistd_32.h. -AK |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #define __NR_ia32_restart_syscall 0 | 11 | #define __NR_ia32_restart_syscall 0 |
diff --git a/include/asm-x86/ide.h b/include/asm-x86/ide.h index 42130adf9c7c..c2552d8bebf7 100644 --- a/include/asm-x86/ide.h +++ b/include/asm-x86/ide.h | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/include/asm-i386/ide.h | ||
3 | * | ||
4 | * Copyright (C) 1994-1996 Linus Torvalds & authors | 2 | * Copyright (C) 1994-1996 Linus Torvalds & authors |
5 | */ | 3 | */ |
6 | 4 | ||
diff --git a/include/asm-x86/irqflags_32.h b/include/asm-x86/irqflags_32.h index 4c7720089cb5..98b21b9bdce8 100644 --- a/include/asm-x86/irqflags_32.h +++ b/include/asm-x86/irqflags_32.h | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-i386/irqflags.h | ||
3 | * | ||
4 | * IRQ flags handling | 2 | * IRQ flags handling |
5 | * | 3 | * |
6 | * This file gets included from lowlevel asm headers too, to provide | 4 | * 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 bb9163bb29d1..38c07db733cf 100644 --- a/include/asm-x86/irqflags_64.h +++ b/include/asm-x86/irqflags_64.h | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-x86_64/irqflags.h | ||
3 | * | ||
4 | * IRQ flags handling | 2 | * IRQ flags handling |
5 | * | 3 | * |
6 | * This file gets included from lowlevel asm headers too, to provide | 4 | * 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 1f730b8bd1fd..989f34c37d32 100644 --- a/include/asm-x86/mach-default/apm.h +++ b/include/asm-x86/mach-default/apm.h | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-i386/mach-default/apm.h | ||
3 | * | ||
4 | * Machine specific APM BIOS functions for generic. | 2 | * Machine specific APM BIOS functions for generic. |
5 | * Split out from apm.c by Osamu Tomita <tomita@cinet.co.jp> | 3 | * Split out from apm.c by Osamu Tomita <tomita@cinet.co.jp> |
6 | */ | 4 | */ |
diff --git a/include/asm-x86/mach-default/mach_timer.h b/include/asm-x86/mach-default/mach_timer.h index 807992fd4171..4b76e536cd98 100644 --- a/include/asm-x86/mach-default/mach_timer.h +++ b/include/asm-x86/mach-default/mach_timer.h | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-i386/mach-default/mach_timer.h | ||
3 | * | ||
4 | * Machine specific calibrate_tsc() for generic. | 2 | * Machine specific calibrate_tsc() for generic. |
5 | * Split out from timer_tsc.c by Osamu Tomita <tomita@cinet.co.jp> | 3 | * Split out from timer_tsc.c by Osamu Tomita <tomita@cinet.co.jp> |
6 | */ | 4 | */ |
diff --git a/include/asm-x86/mach-default/mach_traps.h b/include/asm-x86/mach-default/mach_traps.h index 625438b8a6eb..2fe7705c0484 100644 --- a/include/asm-x86/mach-default/mach_traps.h +++ b/include/asm-x86/mach-default/mach_traps.h | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-i386/mach-default/mach_traps.h | ||
3 | * | ||
4 | * Machine specific NMI handling for generic. | 2 | * Machine specific NMI handling for generic. |
5 | * Split out from traps.c by Osamu Tomita <tomita@cinet.co.jp> | 3 | * Split out from traps.c by Osamu Tomita <tomita@cinet.co.jp> |
6 | */ | 4 | */ |
diff --git a/include/asm-x86/nmi_32.h b/include/asm-x86/nmi_32.h index 70a958a8e381..7206c7e8a388 100644 --- a/include/asm-x86/nmi_32.h +++ b/include/asm-x86/nmi_32.h | |||
@@ -1,6 +1,3 @@ | |||
1 | /* | ||
2 | * linux/include/asm-i386/nmi.h | ||
3 | */ | ||
4 | #ifndef ASM_NMI_H | 1 | #ifndef ASM_NMI_H |
5 | #define ASM_NMI_H | 2 | #define ASM_NMI_H |
6 | 3 | ||
diff --git a/include/asm-x86/nmi_64.h b/include/asm-x86/nmi_64.h index 65b6acf3bb59..92f36fb1dc62 100644 --- a/include/asm-x86/nmi_64.h +++ b/include/asm-x86/nmi_64.h | |||
@@ -1,6 +1,3 @@ | |||
1 | /* | ||
2 | * linux/include/asm-i386/nmi.h | ||
3 | */ | ||
4 | #ifndef ASM_NMI_H | 1 | #ifndef ASM_NMI_H |
5 | #define ASM_NMI_H | 2 | #define ASM_NMI_H |
6 | 3 | ||
diff --git a/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h index 58880a1ddd65..3b51a18f16d5 100644 --- a/include/asm-x86/processor_32.h +++ b/include/asm-x86/processor_32.h | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-i386/processor.h | ||
3 | * | ||
4 | * Copyright (C) 1994 Linus Torvalds | 2 | * Copyright (C) 1994 Linus Torvalds |
5 | */ | 3 | */ |
6 | 4 | ||
diff --git a/include/asm-x86/processor_64.h b/include/asm-x86/processor_64.h index 6b96e1f12a42..6c0d96a7af63 100644 --- a/include/asm-x86/processor_64.h +++ b/include/asm-x86/processor_64.h | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-x86_64/processor.h | ||
3 | * | ||
4 | * Copyright (C) 1994 Linus Torvalds | 2 | * Copyright (C) 1994 Linus Torvalds |
5 | */ | 3 | */ |
6 | 4 | ||
diff --git a/include/asm-x86/rio.h b/include/asm-x86/rio.h index c7350f6d2015..97cdcc9887ba 100644 --- a/include/asm-x86/rio.h +++ b/include/asm-x86/rio.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Derived from include/asm-i386/mach-summit/mach_mpparse.h | 2 | * Derived from include/asm-x86/mach-summit/mach_mpparse.h |
3 | * and include/asm-i386/mach-default/bios_ebda.h | 3 | * and include/asm-x86/mach-default/bios_ebda.h |
4 | * | 4 | * |
5 | * Author: Laurent Vivier <Laurent.Vivier@bull.net> | 5 | * Author: Laurent Vivier <Laurent.Vivier@bull.net> |
6 | */ | 6 | */ |
diff --git a/include/asm-x86/rwsem.h b/include/asm-x86/rwsem.h index 041906f3c6df..a7e7e14cb430 100644 --- a/include/asm-x86/rwsem.h +++ b/include/asm-x86/rwsem.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * | 2 | * |
3 | * Written by David Howells (dhowells@redhat.com). | 3 | * Written by David Howells (dhowells@redhat.com). |
4 | * | 4 | * |
5 | * Derived from asm-i386/semaphore.h | 5 | * Derived from asm-x86/semaphore.h |
6 | * | 6 | * |
7 | * | 7 | * |
8 | * The MSW of the count is the negated number of active writers and waiting | 8 | * 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 9040f5a61278..fdca80a851e2 100644 --- a/include/asm-x86/topology_32.h +++ b/include/asm-x86/topology_32.h | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * linux/include/asm-i386/topology.h | ||
3 | * | ||
4 | * Written by: Matthew Dobson, IBM Corporation | 2 | * Written by: Matthew Dobson, IBM Corporation |
5 | * | 3 | * |
6 | * Copyright (C) 2002, IBM Corp. | 4 | * Copyright (C) 2002, IBM Corp. |
diff --git a/include/asm-x86/xor_32.h b/include/asm-x86/xor_32.h index 23c86cef3b25..a41ef1bdd424 100644 --- a/include/asm-x86/xor_32.h +++ b/include/asm-x86/xor_32.h | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-i386/xor.h | ||
3 | * | ||
4 | * Optimized RAID-5 checksumming functions for MMX and SSE. | 2 | * Optimized RAID-5 checksumming functions for MMX and SSE. |
5 | * | 3 | * |
6 | * This program is free software; you can redistribute it and/or modify | 4 | * 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 f942fcc21831..1eee7fcb2420 100644 --- a/include/asm-x86/xor_64.h +++ b/include/asm-x86/xor_64.h | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-x86_64/xor.h | ||
3 | * | ||
4 | * Optimized RAID-5 checksumming functions for MMX and SSE. | 2 | * Optimized RAID-5 checksumming functions for MMX and SSE. |
5 | * | 3 | * |
6 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |