tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

x86: use _types.h headers in asm where available

In general, the only definitions that assembly files can use
are in _types.S headers (where available), so convert them.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

Jeremy Fitzhardinge 0341c14d beb6943d

+26 -26
+1 -1
arch/x86/boot/compressed/head_32.S
··· 25 25 26 26 #include <linux/linkage.h> 27 27 #include <asm/segment.h> 28 - #include <asm/page.h> 28 + #include <asm/page_types.h> 29 29 #include <asm/boot.h> 30 30 #include <asm/asm-offsets.h> 31 31
+2 -2
arch/x86/boot/compressed/head_64.S
··· 26 26 27 27 #include <linux/linkage.h> 28 28 #include <asm/segment.h> 29 - #include <asm/pgtable.h> 30 - #include <asm/page.h> 29 + #include <asm/pgtable_types.h> 30 + #include <asm/page_types.h> 31 31 #include <asm/boot.h> 32 32 #include <asm/msr.h> 33 33 #include <asm/processor-flags.h>
+1 -1
arch/x86/boot/header.S
··· 19 19 #include <linux/utsrelease.h> 20 20 #include <asm/boot.h> 21 21 #include <asm/e820.h> 22 - #include <asm/page.h> 22 + #include <asm/page_types.h> 23 23 #include <asm/setup.h> 24 24 #include "boot.h" 25 25 #include "offsets.h"
+2 -2
arch/x86/kernel/acpi/realmode/wakeup.S
··· 3 3 */ 4 4 #include <asm/segment.h> 5 5 #include <asm/msr-index.h> 6 - #include <asm/page.h> 7 - #include <asm/pgtable.h> 6 + #include <asm/page_types.h> 7 + #include <asm/pgtable_types.h> 8 8 #include <asm/processor-flags.h> 9 9 10 10 .code16
+1 -1
arch/x86/kernel/acpi/wakeup_32.S
··· 1 1 .section .text.page_aligned 2 2 #include <linux/linkage.h> 3 3 #include <asm/segment.h> 4 - #include <asm/page.h> 4 + #include <asm/page_types.h> 5 5 6 6 # Copyright 2003, 2008 Pavel Machek <pavel@suse.cz>, distribute under GPLv2 7 7
+2 -2
arch/x86/kernel/acpi/wakeup_64.S
··· 1 1 .text 2 2 #include <linux/linkage.h> 3 3 #include <asm/segment.h> 4 - #include <asm/pgtable.h> 5 - #include <asm/page.h> 4 + #include <asm/pgtable_types.h> 5 + #include <asm/page_types.h> 6 6 #include <asm/msr.h> 7 7 #include <asm/asm-offsets.h> 8 8
+1 -1
arch/x86/kernel/efi_stub_32.S
··· 6 6 */ 7 7 8 8 #include <linux/linkage.h> 9 - #include <asm/page.h> 9 + #include <asm/page_types.h> 10 10 11 11 /* 12 12 * efi_call_phys(void *, ...) is a function with variable parameters.
+1 -1
arch/x86/kernel/entry_32.S
··· 47 47 #include <asm/errno.h> 48 48 #include <asm/segment.h> 49 49 #include <asm/smp.h> 50 - #include <asm/page.h> 50 + #include <asm/page_types.h> 51 51 #include <asm/desc.h> 52 52 #include <asm/percpu.h> 53 53 #include <asm/dwarf2.h>
+1 -1
arch/x86/kernel/entry_64.S
··· 48 48 #include <asm/unistd.h> 49 49 #include <asm/thread_info.h> 50 50 #include <asm/hw_irq.h> 51 - #include <asm/page.h> 51 + #include <asm/page_types.h> 52 52 #include <asm/irqflags.h> 53 53 #include <asm/paravirt.h> 54 54 #include <asm/ftrace.h>
+2 -2
arch/x86/kernel/head_32.S
··· 11 11 #include <linux/init.h> 12 12 #include <linux/linkage.h> 13 13 #include <asm/segment.h> 14 - #include <asm/page.h> 15 - #include <asm/pgtable.h> 14 + #include <asm/page_types.h> 15 + #include <asm/pgtable_types.h> 16 16 #include <asm/desc.h> 17 17 #include <asm/cache.h> 18 18 #include <asm/thread_info.h>
+1 -1
arch/x86/kernel/relocate_kernel_32.S
··· 7 7 */ 8 8 9 9 #include <linux/linkage.h> 10 - #include <asm/page.h> 10 + #include <asm/page_types.h> 11 11 #include <asm/kexec.h> 12 12 #include <asm/processor-flags.h> 13 13
+2 -2
arch/x86/kernel/relocate_kernel_64.S
··· 7 7 */ 8 8 9 9 #include <linux/linkage.h> 10 - #include <asm/page.h> 10 + #include <asm/page_types.h> 11 11 #include <asm/kexec.h> 12 12 #include <asm/processor-flags.h> 13 - #include <asm/pgtable.h> 13 + #include <asm/pgtable_types.h> 14 14 15 15 /* 16 16 * Must be relocatable PIC code callable as a C function
+1 -1
arch/x86/kernel/trampoline_32.S
··· 29 29 30 30 #include <linux/linkage.h> 31 31 #include <asm/segment.h> 32 - #include <asm/page.h> 32 + #include <asm/page_types.h> 33 33 34 34 /* We can free up trampoline after bootup if cpu hotplug is not supported. */ 35 35 #ifndef CONFIG_HOTPLUG_CPU
+2 -2
arch/x86/kernel/trampoline_64.S
··· 25 25 */ 26 26 27 27 #include <linux/linkage.h> 28 - #include <asm/pgtable.h> 29 - #include <asm/page.h> 28 + #include <asm/pgtable_types.h> 29 + #include <asm/page_types.h> 30 30 #include <asm/msr.h> 31 31 #include <asm/segment.h> 32 32 #include <asm/processor-flags.h>
+1 -1
arch/x86/kernel/vmlinux_32.lds.S
··· 12 12 13 13 #include <asm-generic/vmlinux.lds.h> 14 14 #include <asm/thread_info.h> 15 - #include <asm/page.h> 15 + #include <asm/page_types.h> 16 16 #include <asm/cache.h> 17 17 #include <asm/boot.h> 18 18
+1 -1
arch/x86/kernel/vmlinux_64.lds.S
··· 6 6 7 7 #include <asm-generic/vmlinux.lds.h> 8 8 #include <asm/asm-offsets.h> 9 - #include <asm/page.h> 9 + #include <asm/page_types.h> 10 10 11 11 #undef i386 /* in case the preprocessor is a 32bit one */ 12 12
+1 -1
arch/x86/lib/getuser.S
··· 28 28 29 29 #include <linux/linkage.h> 30 30 #include <asm/dwarf2.h> 31 - #include <asm/page.h> 31 + #include <asm/page_types.h> 32 32 #include <asm/errno.h> 33 33 #include <asm/asm-offsets.h> 34 34 #include <asm/thread_info.h>
+1 -1
arch/x86/power/hibernate_asm_32.S
··· 8 8 9 9 #include <linux/linkage.h> 10 10 #include <asm/segment.h> 11 - #include <asm/page.h> 11 + #include <asm/page_types.h> 12 12 #include <asm/asm-offsets.h> 13 13 #include <asm/processor-flags.h> 14 14
+1 -1
arch/x86/power/hibernate_asm_64.S
··· 18 18 .text 19 19 #include <linux/linkage.h> 20 20 #include <asm/segment.h> 21 - #include <asm/page.h> 21 + #include <asm/page_types.h> 22 22 #include <asm/asm-offsets.h> 23 23 #include <asm/processor-flags.h> 24 24
+1 -1
arch/x86/xen/xen-head.S
··· 8 8 9 9 #include <asm/boot.h> 10 10 #include <asm/asm.h> 11 - #include <asm/page.h> 11 + #include <asm/page_types.h> 12 12 13 13 #include <xen/interface/elfnote.h> 14 14 #include <asm/xen/interface.h>