diff options
Diffstat (limited to 'include')
144 files changed, 0 insertions, 3690 deletions
diff --git a/include/asm-um/a.out-core.h b/include/asm-um/a.out-core.h deleted file mode 100644 index 995643b18309..000000000000 --- a/include/asm-um/a.out-core.h +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | /* a.out coredump register dumper | ||
2 | * | ||
3 | * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. | ||
4 | * Written by David Howells (dhowells@redhat.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public Licence | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the Licence, or (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #ifndef __UM_A_OUT_CORE_H | ||
13 | #define __UM_A_OUT_CORE_H | ||
14 | |||
15 | #ifdef __KERNEL__ | ||
16 | |||
17 | #include <linux/user.h> | ||
18 | |||
19 | /* | ||
20 | * fill in the user structure for an a.out core dump | ||
21 | */ | ||
22 | static inline void aout_dump_thread(struct pt_regs *regs, struct user *u) | ||
23 | { | ||
24 | } | ||
25 | |||
26 | #endif /* __KERNEL__ */ | ||
27 | #endif /* __UM_A_OUT_CORE_H */ | ||
diff --git a/include/asm-um/a.out.h b/include/asm-um/a.out.h deleted file mode 100644 index 754181ee8683..000000000000 --- a/include/asm-um/a.out.h +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __UM_A_OUT_H | ||
7 | #define __UM_A_OUT_H | ||
8 | |||
9 | #include "asm/arch/a.out.h" | ||
10 | |||
11 | #endif | ||
diff --git a/include/asm-um/alternative-asm.h b/include/asm-um/alternative-asm.h deleted file mode 100644 index 9aa9fa2402a4..000000000000 --- a/include/asm-um/alternative-asm.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_ALTERNATIVE_ASM_I | ||
2 | #define __UM_ALTERNATIVE_ASM_I | ||
3 | |||
4 | #include "asm/arch/alternative-asm.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/alternative.h b/include/asm-um/alternative.h deleted file mode 100644 index b6434396bd42..000000000000 --- a/include/asm-um/alternative.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_ALTERNATIVE_H | ||
2 | #define __UM_ALTERNATIVE_H | ||
3 | |||
4 | #include "asm/arch/alternative.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/apic.h b/include/asm-um/apic.h deleted file mode 100644 index 876dee84ab11..000000000000 --- a/include/asm-um/apic.h +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | #ifndef __UM_APIC_H | ||
2 | #define __UM_APIC_H | ||
3 | |||
4 | #endif | ||
diff --git a/include/asm-um/archparam-i386.h b/include/asm-um/archparam-i386.h deleted file mode 100644 index 49e89b8d7e58..000000000000 --- a/include/asm-um/archparam-i386.h +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __UM_ARCHPARAM_I386_H | ||
7 | #define __UM_ARCHPARAM_I386_H | ||
8 | |||
9 | /********* Nothing for asm-um/hardirq.h **********/ | ||
10 | |||
11 | /********* Nothing for asm-um/hw_irq.h **********/ | ||
12 | |||
13 | /********* Nothing for asm-um/string.h **********/ | ||
14 | |||
15 | #endif | ||
16 | |||
17 | /* | ||
18 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
19 | * Emacs will notice this stuff at the end of the file and automatically | ||
20 | * adjust the settings for this buffer only. This must remain at the end | ||
21 | * of the file. | ||
22 | * --------------------------------------------------------------------------- | ||
23 | * Local variables: | ||
24 | * c-file-style: "linux" | ||
25 | * End: | ||
26 | */ | ||
diff --git a/include/asm-um/archparam-ppc.h b/include/asm-um/archparam-ppc.h deleted file mode 100644 index 4269d8a37b4f..000000000000 --- a/include/asm-um/archparam-ppc.h +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | #ifndef __UM_ARCHPARAM_PPC_H | ||
2 | #define __UM_ARCHPARAM_PPC_H | ||
3 | |||
4 | /********* Bits for asm-um/string.h **********/ | ||
5 | |||
6 | #define __HAVE_ARCH_STRRCHR | ||
7 | |||
8 | #endif | ||
diff --git a/include/asm-um/archparam-x86_64.h b/include/asm-um/archparam-x86_64.h deleted file mode 100644 index 270ed9586b68..000000000000 --- a/include/asm-um/archparam-x86_64.h +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright 2003 PathScale, Inc. | ||
3 | * | ||
4 | * Licensed under the GPL | ||
5 | */ | ||
6 | |||
7 | #ifndef __UM_ARCHPARAM_X86_64_H | ||
8 | #define __UM_ARCHPARAM_X86_64_H | ||
9 | |||
10 | |||
11 | /* No user-accessible fixmap addresses, i.e. vsyscall */ | ||
12 | #define FIXADDR_USER_START 0 | ||
13 | #define FIXADDR_USER_END 0 | ||
14 | |||
15 | #endif | ||
16 | |||
17 | /* | ||
18 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
19 | * Emacs will notice this stuff at the end of the file and automatically | ||
20 | * adjust the settings for this buffer only. This must remain at the end | ||
21 | * of the file. | ||
22 | * --------------------------------------------------------------------------- | ||
23 | * Local variables: | ||
24 | * c-file-style: "linux" | ||
25 | * End: | ||
26 | */ | ||
diff --git a/include/asm-um/asm.h b/include/asm-um/asm.h deleted file mode 100644 index af1269a1e9eb..000000000000 --- a/include/asm-um/asm.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_ASM_H | ||
2 | #define __UM_ASM_H | ||
3 | |||
4 | #include "asm/arch/asm.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/atomic.h b/include/asm-um/atomic.h deleted file mode 100644 index b683f1034d1e..000000000000 --- a/include/asm-um/atomic.h +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | #ifndef __UM_ATOMIC_H | ||
2 | #define __UM_ATOMIC_H | ||
3 | |||
4 | /* The i386 atomic.h calls printk, but doesn't include kernel.h, so we | ||
5 | * include it here. | ||
6 | */ | ||
7 | #include "linux/kernel.h" | ||
8 | |||
9 | #include "asm/arch/atomic.h" | ||
10 | |||
11 | #endif | ||
diff --git a/include/asm-um/auxvec.h b/include/asm-um/auxvec.h deleted file mode 100644 index 1e5e1c2fc9b1..000000000000 --- a/include/asm-um/auxvec.h +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | #ifndef __UM_AUXVEC_H | ||
2 | #define __UM_AUXVEC_H | ||
3 | |||
4 | #endif | ||
diff --git a/include/asm-um/bitops.h b/include/asm-um/bitops.h deleted file mode 100644 index e4d38d437b97..000000000000 --- a/include/asm-um/bitops.h +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | #ifndef __UM_BITOPS_H | ||
2 | #define __UM_BITOPS_H | ||
3 | |||
4 | #ifndef _LINUX_BITOPS_H | ||
5 | #error only <linux/bitops.h> can be included directly | ||
6 | #endif | ||
7 | |||
8 | #include "asm/arch/bitops.h" | ||
9 | |||
10 | #endif | ||
diff --git a/include/asm-um/boot.h b/include/asm-um/boot.h deleted file mode 100644 index 09548c3e784e..000000000000 --- a/include/asm-um/boot.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_BOOT_H | ||
2 | #define __UM_BOOT_H | ||
3 | |||
4 | #include "asm/arch/boot.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/bug.h b/include/asm-um/bug.h deleted file mode 100644 index 9e33b864c359..000000000000 --- a/include/asm-um/bug.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_BUG_H | ||
2 | #define __UM_BUG_H | ||
3 | |||
4 | #include <asm-generic/bug.h> | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/bugs.h b/include/asm-um/bugs.h deleted file mode 100644 index 6a72e240d5fc..000000000000 --- a/include/asm-um/bugs.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_BUGS_H | ||
2 | #define __UM_BUGS_H | ||
3 | |||
4 | void check_bugs(void); | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/byteorder.h b/include/asm-um/byteorder.h deleted file mode 100644 index eee0a834f447..000000000000 --- a/include/asm-um/byteorder.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_BYTEORDER_H | ||
2 | #define __UM_BYTEORDER_H | ||
3 | |||
4 | #include "asm/arch/byteorder.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/cache.h b/include/asm-um/cache.h deleted file mode 100644 index 19e1bdd67416..000000000000 --- a/include/asm-um/cache.h +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | #ifndef __UM_CACHE_H | ||
2 | #define __UM_CACHE_H | ||
3 | |||
4 | |||
5 | #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT) | ||
6 | # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) | ||
7 | #elif defined(CONFIG_UML_X86) /* 64-bit */ | ||
8 | # define L1_CACHE_SHIFT 6 /* Should be 7 on Intel */ | ||
9 | #else | ||
10 | /* XXX: this was taken from x86, now it's completely random. Luckily only | ||
11 | * affects SMP padding. */ | ||
12 | # define L1_CACHE_SHIFT 5 | ||
13 | #endif | ||
14 | |||
15 | #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) | ||
16 | |||
17 | #endif | ||
diff --git a/include/asm-um/cacheflush.h b/include/asm-um/cacheflush.h deleted file mode 100644 index 12e9d4b74c8f..000000000000 --- a/include/asm-um/cacheflush.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_CACHEFLUSH_H | ||
2 | #define __UM_CACHEFLUSH_H | ||
3 | |||
4 | #include "asm/arch/cacheflush.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/calling.h b/include/asm-um/calling.h deleted file mode 100644 index 0b2384cc99fd..000000000000 --- a/include/asm-um/calling.h +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | # Copyright 2003 - 2004 Pathscale, Inc | ||
2 | # Released under the GPL | ||
3 | |||
4 | #ifndef __UM_CALLING_H /* XXX x86_64 */ | ||
5 | #define __UM_CALLING_H | ||
6 | |||
7 | #include "asm/arch/calling.h" | ||
8 | |||
9 | #endif | ||
diff --git a/include/asm-um/checksum.h b/include/asm-um/checksum.h deleted file mode 100644 index 5b501361e361..000000000000 --- a/include/asm-um/checksum.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_CHECKSUM_H | ||
2 | #define __UM_CHECKSUM_H | ||
3 | |||
4 | #include "sysdep/checksum.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/cmpxchg.h b/include/asm-um/cmpxchg.h deleted file mode 100644 index 529376a99885..000000000000 --- a/include/asm-um/cmpxchg.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_CMPXCHG_H | ||
2 | #define __UM_CMPXCHG_H | ||
3 | |||
4 | #include "asm/arch/cmpxchg.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/cobalt.h b/include/asm-um/cobalt.h deleted file mode 100644 index f813a684be98..000000000000 --- a/include/asm-um/cobalt.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_COBALT_H | ||
2 | #define __UM_COBALT_H | ||
3 | |||
4 | #include "asm/arch/cobalt.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/common.lds.S b/include/asm-um/common.lds.S deleted file mode 100644 index cb0248616d49..000000000000 --- a/include/asm-um/common.lds.S +++ /dev/null | |||
@@ -1,130 +0,0 @@ | |||
1 | #include <asm-generic/vmlinux.lds.h> | ||
2 | |||
3 | .fini : { *(.fini) } =0x9090 | ||
4 | _etext = .; | ||
5 | PROVIDE (etext = .); | ||
6 | |||
7 | . = ALIGN(4096); | ||
8 | _sdata = .; | ||
9 | PROVIDE (sdata = .); | ||
10 | |||
11 | RODATA | ||
12 | |||
13 | .unprotected : { *(.unprotected) } | ||
14 | . = ALIGN(4096); | ||
15 | PROVIDE (_unprotected_end = .); | ||
16 | |||
17 | . = ALIGN(4096); | ||
18 | .note : { *(.note.*) } | ||
19 | __ex_table : { | ||
20 | __start___ex_table = .; | ||
21 | *(__ex_table) | ||
22 | __stop___ex_table = .; | ||
23 | } | ||
24 | |||
25 | BUG_TABLE | ||
26 | |||
27 | .uml.setup.init : { | ||
28 | __uml_setup_start = .; | ||
29 | *(.uml.setup.init) | ||
30 | __uml_setup_end = .; | ||
31 | } | ||
32 | |||
33 | .uml.help.init : { | ||
34 | __uml_help_start = .; | ||
35 | *(.uml.help.init) | ||
36 | __uml_help_end = .; | ||
37 | } | ||
38 | |||
39 | .uml.postsetup.init : { | ||
40 | __uml_postsetup_start = .; | ||
41 | *(.uml.postsetup.init) | ||
42 | __uml_postsetup_end = .; | ||
43 | } | ||
44 | |||
45 | .init.setup : { | ||
46 | __setup_start = .; | ||
47 | *(.init.setup) | ||
48 | __setup_end = .; | ||
49 | } | ||
50 | |||
51 | . = ALIGN(32); | ||
52 | .data.percpu : { | ||
53 | __per_cpu_start = . ; | ||
54 | *(.data.percpu) | ||
55 | __per_cpu_end = . ; | ||
56 | } | ||
57 | |||
58 | .initcall.init : { | ||
59 | __initcall_start = .; | ||
60 | INITCALLS | ||
61 | __initcall_end = .; | ||
62 | } | ||
63 | |||
64 | .con_initcall.init : { | ||
65 | __con_initcall_start = .; | ||
66 | *(.con_initcall.init) | ||
67 | __con_initcall_end = .; | ||
68 | } | ||
69 | |||
70 | .uml.initcall.init : { | ||
71 | __uml_initcall_start = .; | ||
72 | *(.uml.initcall.init) | ||
73 | __uml_initcall_end = .; | ||
74 | } | ||
75 | __init_end = .; | ||
76 | |||
77 | SECURITY_INIT | ||
78 | |||
79 | .exitcall : { | ||
80 | __exitcall_begin = .; | ||
81 | *(.exitcall.exit) | ||
82 | __exitcall_end = .; | ||
83 | } | ||
84 | |||
85 | .uml.exitcall : { | ||
86 | __uml_exitcall_begin = .; | ||
87 | *(.uml.exitcall.exit) | ||
88 | __uml_exitcall_end = .; | ||
89 | } | ||
90 | |||
91 | . = ALIGN(4); | ||
92 | .altinstructions : { | ||
93 | __alt_instructions = .; | ||
94 | *(.altinstructions) | ||
95 | __alt_instructions_end = .; | ||
96 | } | ||
97 | .altinstr_replacement : { *(.altinstr_replacement) } | ||
98 | /* .exit.text is discard at runtime, not link time, to deal with references | ||
99 | from .altinstructions and .eh_frame */ | ||
100 | .exit.text : { *(.exit.text) } | ||
101 | .exit.data : { *(.exit.data) } | ||
102 | |||
103 | .preinit_array : { | ||
104 | __preinit_array_start = .; | ||
105 | *(.preinit_array) | ||
106 | __preinit_array_end = .; | ||
107 | } | ||
108 | .init_array : { | ||
109 | __init_array_start = .; | ||
110 | *(.init_array) | ||
111 | __init_array_end = .; | ||
112 | } | ||
113 | .fini_array : { | ||
114 | __fini_array_start = .; | ||
115 | *(.fini_array) | ||
116 | __fini_array_end = .; | ||
117 | } | ||
118 | |||
119 | . = ALIGN(4096); | ||
120 | .init.ramfs : { | ||
121 | __initramfs_start = .; | ||
122 | *(.init.ramfs) | ||
123 | __initramfs_end = .; | ||
124 | } | ||
125 | |||
126 | /* Sections to be discarded */ | ||
127 | /DISCARD/ : { | ||
128 | *(.exitcall.exit) | ||
129 | } | ||
130 | |||
diff --git a/include/asm-um/cpufeature.h b/include/asm-um/cpufeature.h deleted file mode 100644 index fb7bd42a4d96..000000000000 --- a/include/asm-um/cpufeature.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_CPUFEATURE_H | ||
2 | #define __UM_CPUFEATURE_H | ||
3 | |||
4 | #include "asm/arch/cpufeature.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/cputime.h b/include/asm-um/cputime.h deleted file mode 100644 index c84acbadfa2f..000000000000 --- a/include/asm-um/cputime.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_CPUTIME_H | ||
2 | #define __UM_CPUTIME_H | ||
3 | |||
4 | #include <asm-generic/cputime.h> | ||
5 | |||
6 | #endif /* __UM_CPUTIME_H */ | ||
diff --git a/include/asm-um/current.h b/include/asm-um/current.h deleted file mode 100644 index c2191d9aa03d..000000000000 --- a/include/asm-um/current.h +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __UM_CURRENT_H | ||
7 | #define __UM_CURRENT_H | ||
8 | |||
9 | #include "linux/thread_info.h" | ||
10 | |||
11 | #define current (current_thread_info()->task) | ||
12 | |||
13 | #endif | ||
diff --git a/include/asm-um/delay.h b/include/asm-um/delay.h deleted file mode 100644 index c71e32b6741e..000000000000 --- a/include/asm-um/delay.h +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | #ifndef __UM_DELAY_H | ||
2 | #define __UM_DELAY_H | ||
3 | |||
4 | #define MILLION 1000000 | ||
5 | |||
6 | /* Undefined on purpose */ | ||
7 | extern void __bad_udelay(void); | ||
8 | |||
9 | extern void __udelay(unsigned long usecs); | ||
10 | extern void __delay(unsigned long loops); | ||
11 | |||
12 | #define udelay(n) ((__builtin_constant_p(n) && (n) > 20000) ? \ | ||
13 | __bad_udelay() : __udelay(n)) | ||
14 | |||
15 | /* It appears that ndelay is not used at all for UML, and has never been | ||
16 | * implemented. */ | ||
17 | extern void __unimplemented_ndelay(void); | ||
18 | #define ndelay(n) __unimplemented_ndelay() | ||
19 | |||
20 | #endif | ||
diff --git a/include/asm-um/desc.h b/include/asm-um/desc.h deleted file mode 100644 index 4ec34a51b62c..000000000000 --- a/include/asm-um/desc.h +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | #ifndef __UM_DESC_H | ||
2 | #define __UM_DESC_H | ||
3 | |||
4 | /* Taken from asm-i386/desc.h, it's the only thing we need. The rest wouldn't | ||
5 | * compile, and has never been used. */ | ||
6 | #define LDT_empty(info) (\ | ||
7 | (info)->base_addr == 0 && \ | ||
8 | (info)->limit == 0 && \ | ||
9 | (info)->contents == 0 && \ | ||
10 | (info)->read_exec_only == 1 && \ | ||
11 | (info)->seg_32bit == 0 && \ | ||
12 | (info)->limit_in_pages == 0 && \ | ||
13 | (info)->seg_not_present == 1 && \ | ||
14 | (info)->useable == 0 ) | ||
15 | |||
16 | #endif | ||
diff --git a/include/asm-um/device.h b/include/asm-um/device.h deleted file mode 100644 index d8f9872b0e2d..000000000000 --- a/include/asm-um/device.h +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | /* | ||
2 | * Arch specific extensions to struct device | ||
3 | * | ||
4 | * This file is released under the GPLv2 | ||
5 | */ | ||
6 | #include <asm-generic/device.h> | ||
7 | |||
diff --git a/include/asm-um/div64.h b/include/asm-um/div64.h deleted file mode 100644 index 1e17f7409cab..000000000000 --- a/include/asm-um/div64.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _UM_DIV64_H | ||
2 | #define _UM_DIV64_H | ||
3 | |||
4 | #include "asm/arch/div64.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/dma-mapping.h b/include/asm-um/dma-mapping.h deleted file mode 100644 index 90fc708b320e..000000000000 --- a/include/asm-um/dma-mapping.h +++ /dev/null | |||
@@ -1,128 +0,0 @@ | |||
1 | #ifndef _ASM_DMA_MAPPING_H | ||
2 | #define _ASM_DMA_MAPPING_H | ||
3 | |||
4 | #include <asm/scatterlist.h> | ||
5 | |||
6 | static inline int | ||
7 | dma_supported(struct device *dev, u64 mask) | ||
8 | { | ||
9 | BUG(); | ||
10 | return(0); | ||
11 | } | ||
12 | |||
13 | static inline int | ||
14 | dma_set_mask(struct device *dev, u64 dma_mask) | ||
15 | { | ||
16 | BUG(); | ||
17 | return(0); | ||
18 | } | ||
19 | |||
20 | static inline void * | ||
21 | dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, | ||
22 | gfp_t flag) | ||
23 | { | ||
24 | BUG(); | ||
25 | return((void *) 0); | ||
26 | } | ||
27 | |||
28 | static inline void | ||
29 | dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, | ||
30 | dma_addr_t dma_handle) | ||
31 | { | ||
32 | BUG(); | ||
33 | } | ||
34 | |||
35 | static inline dma_addr_t | ||
36 | dma_map_single(struct device *dev, void *cpu_addr, size_t size, | ||
37 | enum dma_data_direction direction) | ||
38 | { | ||
39 | BUG(); | ||
40 | return(0); | ||
41 | } | ||
42 | |||
43 | static inline void | ||
44 | dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, | ||
45 | enum dma_data_direction direction) | ||
46 | { | ||
47 | BUG(); | ||
48 | } | ||
49 | |||
50 | static inline dma_addr_t | ||
51 | dma_map_page(struct device *dev, struct page *page, | ||
52 | unsigned long offset, size_t size, | ||
53 | enum dma_data_direction direction) | ||
54 | { | ||
55 | BUG(); | ||
56 | return(0); | ||
57 | } | ||
58 | |||
59 | static inline void | ||
60 | dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, | ||
61 | enum dma_data_direction direction) | ||
62 | { | ||
63 | BUG(); | ||
64 | } | ||
65 | |||
66 | static inline int | ||
67 | dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, | ||
68 | enum dma_data_direction direction) | ||
69 | { | ||
70 | BUG(); | ||
71 | return(0); | ||
72 | } | ||
73 | |||
74 | static inline void | ||
75 | dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries, | ||
76 | enum dma_data_direction direction) | ||
77 | { | ||
78 | BUG(); | ||
79 | } | ||
80 | |||
81 | static inline void | ||
82 | dma_sync_single(struct device *dev, dma_addr_t dma_handle, size_t size, | ||
83 | enum dma_data_direction direction) | ||
84 | { | ||
85 | BUG(); | ||
86 | } | ||
87 | |||
88 | static inline void | ||
89 | dma_sync_sg(struct device *dev, struct scatterlist *sg, int nelems, | ||
90 | enum dma_data_direction direction) | ||
91 | { | ||
92 | BUG(); | ||
93 | } | ||
94 | |||
95 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) | ||
96 | #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) | ||
97 | #define dma_is_consistent(d, h) (1) | ||
98 | |||
99 | static inline int | ||
100 | dma_get_cache_alignment(void) | ||
101 | { | ||
102 | BUG(); | ||
103 | return(0); | ||
104 | } | ||
105 | |||
106 | static inline void | ||
107 | dma_sync_single_range(struct device *dev, dma_addr_t dma_handle, | ||
108 | unsigned long offset, size_t size, | ||
109 | enum dma_data_direction direction) | ||
110 | { | ||
111 | BUG(); | ||
112 | } | ||
113 | |||
114 | static inline void | ||
115 | dma_cache_sync(struct device *dev, void *vaddr, size_t size, | ||
116 | enum dma_data_direction direction) | ||
117 | { | ||
118 | BUG(); | ||
119 | } | ||
120 | |||
121 | static inline int | ||
122 | dma_mapping_error(struct device *dev, dma_addr_t dma_handle) | ||
123 | { | ||
124 | BUG(); | ||
125 | return 0; | ||
126 | } | ||
127 | |||
128 | #endif | ||
diff --git a/include/asm-um/dma.h b/include/asm-um/dma.h deleted file mode 100644 index 9f6139a8a525..000000000000 --- a/include/asm-um/dma.h +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | #ifndef __UM_DMA_H | ||
2 | #define __UM_DMA_H | ||
3 | |||
4 | #include "asm/io.h" | ||
5 | |||
6 | extern unsigned long uml_physmem; | ||
7 | |||
8 | #define MAX_DMA_ADDRESS (uml_physmem) | ||
9 | |||
10 | #endif | ||
diff --git a/include/asm-um/dwarf2.h b/include/asm-um/dwarf2.h deleted file mode 100644 index d1a02e762931..000000000000 --- a/include/asm-um/dwarf2.h +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | /* Copyright 2003 - 2004 Pathscale, Inc | ||
2 | * Released under the GPL | ||
3 | */ | ||
4 | |||
5 | /* Needed on x86_64 by thunk.S */ | ||
6 | #ifndef __UM_DWARF2_H | ||
7 | #define __UM_DWARF2_H | ||
8 | |||
9 | #include "asm/arch/dwarf2.h" | ||
10 | |||
11 | #endif | ||
diff --git a/include/asm-um/elf-i386.h b/include/asm-um/elf-i386.h deleted file mode 100644 index d0da9d7c5371..000000000000 --- a/include/asm-um/elf-i386.h +++ /dev/null | |||
@@ -1,163 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | #ifndef __UM_ELF_I386_H | ||
6 | #define __UM_ELF_I386_H | ||
7 | |||
8 | #include <asm/user.h> | ||
9 | #include "skas.h" | ||
10 | |||
11 | #define R_386_NONE 0 | ||
12 | #define R_386_32 1 | ||
13 | #define R_386_PC32 2 | ||
14 | #define R_386_GOT32 3 | ||
15 | #define R_386_PLT32 4 | ||
16 | #define R_386_COPY 5 | ||
17 | #define R_386_GLOB_DAT 6 | ||
18 | #define R_386_JMP_SLOT 7 | ||
19 | #define R_386_RELATIVE 8 | ||
20 | #define R_386_GOTOFF 9 | ||
21 | #define R_386_GOTPC 10 | ||
22 | #define R_386_NUM 11 | ||
23 | |||
24 | typedef unsigned long elf_greg_t; | ||
25 | |||
26 | #define ELF_NGREG (sizeof (struct user_regs_struct) / sizeof(elf_greg_t)) | ||
27 | typedef elf_greg_t elf_gregset_t[ELF_NGREG]; | ||
28 | |||
29 | typedef struct user_i387_struct elf_fpregset_t; | ||
30 | |||
31 | /* | ||
32 | * This is used to ensure we don't load something for the wrong architecture. | ||
33 | */ | ||
34 | #define elf_check_arch(x) \ | ||
35 | (((x)->e_machine == EM_386) || ((x)->e_machine == EM_486)) | ||
36 | |||
37 | #define ELF_CLASS ELFCLASS32 | ||
38 | #define ELF_DATA ELFDATA2LSB | ||
39 | #define ELF_ARCH EM_386 | ||
40 | |||
41 | #define ELF_PLAT_INIT(regs, load_addr) do { \ | ||
42 | PT_REGS_EBX(regs) = 0; \ | ||
43 | PT_REGS_ECX(regs) = 0; \ | ||
44 | PT_REGS_EDX(regs) = 0; \ | ||
45 | PT_REGS_ESI(regs) = 0; \ | ||
46 | PT_REGS_EDI(regs) = 0; \ | ||
47 | PT_REGS_EBP(regs) = 0; \ | ||
48 | PT_REGS_EAX(regs) = 0; \ | ||
49 | } while (0) | ||
50 | |||
51 | #define USE_ELF_CORE_DUMP | ||
52 | #define ELF_EXEC_PAGESIZE 4096 | ||
53 | |||
54 | #define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3) | ||
55 | |||
56 | /* Shamelessly stolen from include/asm-i386/elf.h */ | ||
57 | |||
58 | #define ELF_CORE_COPY_REGS(pr_reg, regs) do { \ | ||
59 | pr_reg[0] = PT_REGS_EBX(regs); \ | ||
60 | pr_reg[1] = PT_REGS_ECX(regs); \ | ||
61 | pr_reg[2] = PT_REGS_EDX(regs); \ | ||
62 | pr_reg[3] = PT_REGS_ESI(regs); \ | ||
63 | pr_reg[4] = PT_REGS_EDI(regs); \ | ||
64 | pr_reg[5] = PT_REGS_EBP(regs); \ | ||
65 | pr_reg[6] = PT_REGS_EAX(regs); \ | ||
66 | pr_reg[7] = PT_REGS_DS(regs); \ | ||
67 | pr_reg[8] = PT_REGS_ES(regs); \ | ||
68 | /* fake once used fs and gs selectors? */ \ | ||
69 | pr_reg[9] = PT_REGS_DS(regs); \ | ||
70 | pr_reg[10] = PT_REGS_DS(regs); \ | ||
71 | pr_reg[11] = PT_REGS_SYSCALL_NR(regs); \ | ||
72 | pr_reg[12] = PT_REGS_IP(regs); \ | ||
73 | pr_reg[13] = PT_REGS_CS(regs); \ | ||
74 | pr_reg[14] = PT_REGS_EFLAGS(regs); \ | ||
75 | pr_reg[15] = PT_REGS_SP(regs); \ | ||
76 | pr_reg[16] = PT_REGS_SS(regs); \ | ||
77 | } while (0); | ||
78 | |||
79 | extern int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu); | ||
80 | |||
81 | #define ELF_CORE_COPY_FPREGS(t, fpu) elf_core_copy_fpregs(t, fpu) | ||
82 | |||
83 | extern long elf_aux_hwcap; | ||
84 | #define ELF_HWCAP (elf_aux_hwcap) | ||
85 | |||
86 | extern char * elf_aux_platform; | ||
87 | #define ELF_PLATFORM (elf_aux_platform) | ||
88 | |||
89 | #define SET_PERSONALITY(ex) do { } while (0) | ||
90 | |||
91 | extern unsigned long vsyscall_ehdr; | ||
92 | extern unsigned long vsyscall_end; | ||
93 | extern unsigned long __kernel_vsyscall; | ||
94 | |||
95 | #define VSYSCALL_BASE vsyscall_ehdr | ||
96 | #define VSYSCALL_END vsyscall_end | ||
97 | |||
98 | /* | ||
99 | * This is the range that is readable by user mode, and things | ||
100 | * acting like user mode such as get_user_pages. | ||
101 | */ | ||
102 | #define FIXADDR_USER_START VSYSCALL_BASE | ||
103 | #define FIXADDR_USER_END VSYSCALL_END | ||
104 | |||
105 | /* | ||
106 | * Architecture-neutral AT_ values in 0-17, leave some room | ||
107 | * for more of them, start the x86-specific ones at 32. | ||
108 | */ | ||
109 | #define AT_SYSINFO 32 | ||
110 | #define AT_SYSINFO_EHDR 33 | ||
111 | |||
112 | #define ARCH_DLINFO \ | ||
113 | do { \ | ||
114 | if ( vsyscall_ehdr ) { \ | ||
115 | NEW_AUX_ENT(AT_SYSINFO, __kernel_vsyscall); \ | ||
116 | NEW_AUX_ENT(AT_SYSINFO_EHDR, vsyscall_ehdr); \ | ||
117 | } \ | ||
118 | } while (0) | ||
119 | |||
120 | /* | ||
121 | * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out | ||
122 | * extra segments containing the vsyscall DSO contents. Dumping its | ||
123 | * contents makes post-mortem fully interpretable later without matching up | ||
124 | * the same kernel and hardware config to see what PC values meant. | ||
125 | * Dumping its extra ELF program headers includes all the other information | ||
126 | * a debugger needs to easily find how the vsyscall DSO was being used. | ||
127 | */ | ||
128 | #define ELF_CORE_EXTRA_PHDRS \ | ||
129 | (vsyscall_ehdr ? (((struct elfhdr *)vsyscall_ehdr)->e_phnum) : 0 ) | ||
130 | |||
131 | #define ELF_CORE_WRITE_EXTRA_PHDRS \ | ||
132 | if ( vsyscall_ehdr ) { \ | ||
133 | const struct elfhdr *const ehdrp = (struct elfhdr *)vsyscall_ehdr; \ | ||
134 | const struct elf_phdr *const phdrp = \ | ||
135 | (const struct elf_phdr *) (vsyscall_ehdr + ehdrp->e_phoff); \ | ||
136 | int i; \ | ||
137 | Elf32_Off ofs = 0; \ | ||
138 | for (i = 0; i < ehdrp->e_phnum; ++i) { \ | ||
139 | struct elf_phdr phdr = phdrp[i]; \ | ||
140 | if (phdr.p_type == PT_LOAD) { \ | ||
141 | ofs = phdr.p_offset = offset; \ | ||
142 | offset += phdr.p_filesz; \ | ||
143 | } \ | ||
144 | else \ | ||
145 | phdr.p_offset += ofs; \ | ||
146 | phdr.p_paddr = 0; /* match other core phdrs */ \ | ||
147 | DUMP_WRITE(&phdr, sizeof(phdr)); \ | ||
148 | } \ | ||
149 | } | ||
150 | #define ELF_CORE_WRITE_EXTRA_DATA \ | ||
151 | if ( vsyscall_ehdr ) { \ | ||
152 | const struct elfhdr *const ehdrp = (struct elfhdr *)vsyscall_ehdr; \ | ||
153 | const struct elf_phdr *const phdrp = \ | ||
154 | (const struct elf_phdr *) (vsyscall_ehdr + ehdrp->e_phoff); \ | ||
155 | int i; \ | ||
156 | for (i = 0; i < ehdrp->e_phnum; ++i) { \ | ||
157 | if (phdrp[i].p_type == PT_LOAD) \ | ||
158 | DUMP_WRITE((void *) phdrp[i].p_vaddr, \ | ||
159 | phdrp[i].p_filesz); \ | ||
160 | } \ | ||
161 | } | ||
162 | |||
163 | #endif | ||
diff --git a/include/asm-um/elf-ppc.h b/include/asm-um/elf-ppc.h deleted file mode 100644 index af9463cd8ce5..000000000000 --- a/include/asm-um/elf-ppc.h +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | #ifndef __UM_ELF_PPC_H | ||
2 | #define __UM_ELF_PPC_H | ||
3 | |||
4 | |||
5 | extern long elf_aux_hwcap; | ||
6 | #define ELF_HWCAP (elf_aux_hwcap) | ||
7 | |||
8 | #define SET_PERSONALITY(ex) do ; while(0) | ||
9 | |||
10 | #define ELF_EXEC_PAGESIZE 4096 | ||
11 | |||
12 | #define elf_check_arch(x) (1) | ||
13 | |||
14 | #ifdef CONFIG_64BIT | ||
15 | #define ELF_CLASS ELFCLASS64 | ||
16 | #else | ||
17 | #define ELF_CLASS ELFCLASS32 | ||
18 | #endif | ||
19 | |||
20 | #define USE_ELF_CORE_DUMP | ||
21 | |||
22 | #define R_386_NONE 0 | ||
23 | #define R_386_32 1 | ||
24 | #define R_386_PC32 2 | ||
25 | #define R_386_GOT32 3 | ||
26 | #define R_386_PLT32 4 | ||
27 | #define R_386_COPY 5 | ||
28 | #define R_386_GLOB_DAT 6 | ||
29 | #define R_386_JMP_SLOT 7 | ||
30 | #define R_386_RELATIVE 8 | ||
31 | #define R_386_GOTOFF 9 | ||
32 | #define R_386_GOTPC 10 | ||
33 | #define R_386_NUM 11 | ||
34 | |||
35 | #define ELF_PLATFORM (0) | ||
36 | |||
37 | #define ELF_ET_DYN_BASE (0x08000000) | ||
38 | |||
39 | /* the following stolen from asm-ppc/elf.h */ | ||
40 | #define ELF_NGREG 48 /* includes nip, msr, lr, etc. */ | ||
41 | #define ELF_NFPREG 33 /* includes fpscr */ | ||
42 | /* General registers */ | ||
43 | typedef unsigned long elf_greg_t; | ||
44 | typedef elf_greg_t elf_gregset_t[ELF_NGREG]; | ||
45 | |||
46 | /* Floating point registers */ | ||
47 | typedef double elf_fpreg_t; | ||
48 | typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; | ||
49 | |||
50 | #define ELF_DATA ELFDATA2MSB | ||
51 | #define ELF_ARCH EM_PPC | ||
52 | |||
53 | #endif | ||
diff --git a/include/asm-um/elf-x86_64.h b/include/asm-um/elf-x86_64.h deleted file mode 100644 index 6e8a9195e952..000000000000 --- a/include/asm-um/elf-x86_64.h +++ /dev/null | |||
@@ -1,119 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright 2003 PathScale, Inc. | ||
3 | * Copyright (C) 2003 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | ||
4 | * | ||
5 | * Licensed under the GPL | ||
6 | */ | ||
7 | #ifndef __UM_ELF_X86_64_H | ||
8 | #define __UM_ELF_X86_64_H | ||
9 | |||
10 | #include <asm/user.h> | ||
11 | #include "skas.h" | ||
12 | |||
13 | /* x86-64 relocation types, taken from asm-x86_64/elf.h */ | ||
14 | #define R_X86_64_NONE 0 /* No reloc */ | ||
15 | #define R_X86_64_64 1 /* Direct 64 bit */ | ||
16 | #define R_X86_64_PC32 2 /* PC relative 32 bit signed */ | ||
17 | #define R_X86_64_GOT32 3 /* 32 bit GOT entry */ | ||
18 | #define R_X86_64_PLT32 4 /* 32 bit PLT address */ | ||
19 | #define R_X86_64_COPY 5 /* Copy symbol at runtime */ | ||
20 | #define R_X86_64_GLOB_DAT 6 /* Create GOT entry */ | ||
21 | #define R_X86_64_JUMP_SLOT 7 /* Create PLT entry */ | ||
22 | #define R_X86_64_RELATIVE 8 /* Adjust by program base */ | ||
23 | #define R_X86_64_GOTPCREL 9 /* 32 bit signed pc relative | ||
24 | offset to GOT */ | ||
25 | #define R_X86_64_32 10 /* Direct 32 bit zero extended */ | ||
26 | #define R_X86_64_32S 11 /* Direct 32 bit sign extended */ | ||
27 | #define R_X86_64_16 12 /* Direct 16 bit zero extended */ | ||
28 | #define R_X86_64_PC16 13 /* 16 bit sign extended pc relative */ | ||
29 | #define R_X86_64_8 14 /* Direct 8 bit sign extended */ | ||
30 | #define R_X86_64_PC8 15 /* 8 bit sign extended pc relative */ | ||
31 | |||
32 | #define R_X86_64_NUM 16 | ||
33 | |||
34 | typedef unsigned long elf_greg_t; | ||
35 | |||
36 | #define ELF_NGREG (sizeof (struct user_regs_struct) / sizeof(elf_greg_t)) | ||
37 | typedef elf_greg_t elf_gregset_t[ELF_NGREG]; | ||
38 | |||
39 | typedef struct user_i387_struct elf_fpregset_t; | ||
40 | |||
41 | /* | ||
42 | * This is used to ensure we don't load something for the wrong architecture. | ||
43 | */ | ||
44 | #define elf_check_arch(x) \ | ||
45 | ((x)->e_machine == EM_X86_64) | ||
46 | |||
47 | #define ELF_CLASS ELFCLASS64 | ||
48 | #define ELF_DATA ELFDATA2LSB | ||
49 | #define ELF_ARCH EM_X86_64 | ||
50 | |||
51 | #define ELF_PLAT_INIT(regs, load_addr) do { \ | ||
52 | PT_REGS_RBX(regs) = 0; \ | ||
53 | PT_REGS_RCX(regs) = 0; \ | ||
54 | PT_REGS_RDX(regs) = 0; \ | ||
55 | PT_REGS_RSI(regs) = 0; \ | ||
56 | PT_REGS_RDI(regs) = 0; \ | ||
57 | PT_REGS_RBP(regs) = 0; \ | ||
58 | PT_REGS_RAX(regs) = 0; \ | ||
59 | PT_REGS_R8(regs) = 0; \ | ||
60 | PT_REGS_R9(regs) = 0; \ | ||
61 | PT_REGS_R10(regs) = 0; \ | ||
62 | PT_REGS_R11(regs) = 0; \ | ||
63 | PT_REGS_R12(regs) = 0; \ | ||
64 | PT_REGS_R13(regs) = 0; \ | ||
65 | PT_REGS_R14(regs) = 0; \ | ||
66 | PT_REGS_R15(regs) = 0; \ | ||
67 | } while (0) | ||
68 | |||
69 | #define ELF_CORE_COPY_REGS(pr_reg, regs) \ | ||
70 | (pr_reg)[0] = (regs)->regs.gp[0]; \ | ||
71 | (pr_reg)[1] = (regs)->regs.gp[1]; \ | ||
72 | (pr_reg)[2] = (regs)->regs.gp[2]; \ | ||
73 | (pr_reg)[3] = (regs)->regs.gp[3]; \ | ||
74 | (pr_reg)[4] = (regs)->regs.gp[4]; \ | ||
75 | (pr_reg)[5] = (regs)->regs.gp[5]; \ | ||
76 | (pr_reg)[6] = (regs)->regs.gp[6]; \ | ||
77 | (pr_reg)[7] = (regs)->regs.gp[7]; \ | ||
78 | (pr_reg)[8] = (regs)->regs.gp[8]; \ | ||
79 | (pr_reg)[9] = (regs)->regs.gp[9]; \ | ||
80 | (pr_reg)[10] = (regs)->regs.gp[10]; \ | ||
81 | (pr_reg)[11] = (regs)->regs.gp[11]; \ | ||
82 | (pr_reg)[12] = (regs)->regs.gp[12]; \ | ||
83 | (pr_reg)[13] = (regs)->regs.gp[13]; \ | ||
84 | (pr_reg)[14] = (regs)->regs.gp[14]; \ | ||
85 | (pr_reg)[15] = (regs)->regs.gp[15]; \ | ||
86 | (pr_reg)[16] = (regs)->regs.gp[16]; \ | ||
87 | (pr_reg)[17] = (regs)->regs.gp[17]; \ | ||
88 | (pr_reg)[18] = (regs)->regs.gp[18]; \ | ||
89 | (pr_reg)[19] = (regs)->regs.gp[19]; \ | ||
90 | (pr_reg)[20] = (regs)->regs.gp[20]; \ | ||
91 | (pr_reg)[21] = current->thread.arch.fs; \ | ||
92 | (pr_reg)[22] = 0; \ | ||
93 | (pr_reg)[23] = 0; \ | ||
94 | (pr_reg)[24] = 0; \ | ||
95 | (pr_reg)[25] = 0; \ | ||
96 | (pr_reg)[26] = 0; | ||
97 | |||
98 | extern int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu); | ||
99 | |||
100 | #define ELF_CORE_COPY_FPREGS(t, fpu) elf_core_copy_fpregs(t, fpu) | ||
101 | |||
102 | #ifdef TIF_IA32 /* XXX */ | ||
103 | #error XXX, indeed | ||
104 | clear_thread_flag(TIF_IA32); | ||
105 | #endif | ||
106 | |||
107 | #define USE_ELF_CORE_DUMP | ||
108 | #define ELF_EXEC_PAGESIZE 4096 | ||
109 | |||
110 | #define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3) | ||
111 | |||
112 | extern long elf_aux_hwcap; | ||
113 | #define ELF_HWCAP (elf_aux_hwcap) | ||
114 | |||
115 | #define ELF_PLATFORM "x86_64" | ||
116 | |||
117 | #define SET_PERSONALITY(ex) do ; while(0) | ||
118 | |||
119 | #endif | ||
diff --git a/include/asm-um/emergency-restart.h b/include/asm-um/emergency-restart.h deleted file mode 100644 index 108d8c48e42e..000000000000 --- a/include/asm-um/emergency-restart.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _ASM_EMERGENCY_RESTART_H | ||
2 | #define _ASM_EMERGENCY_RESTART_H | ||
3 | |||
4 | #include <asm-generic/emergency-restart.h> | ||
5 | |||
6 | #endif /* _ASM_EMERGENCY_RESTART_H */ | ||
diff --git a/include/asm-um/errno.h b/include/asm-um/errno.h deleted file mode 100644 index b7a9e37fd8d8..000000000000 --- a/include/asm-um/errno.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_ERRNO_H | ||
2 | #define __UM_ERRNO_H | ||
3 | |||
4 | #include "asm/arch/errno.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/fcntl.h b/include/asm-um/fcntl.h deleted file mode 100644 index 812a65446d92..000000000000 --- a/include/asm-um/fcntl.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_FCNTL_H | ||
2 | #define __UM_FCNTL_H | ||
3 | |||
4 | #include "asm/arch/fcntl.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/fixmap.h b/include/asm-um/fixmap.h deleted file mode 100644 index 9d2be52b8655..000000000000 --- a/include/asm-um/fixmap.h +++ /dev/null | |||
@@ -1,98 +0,0 @@ | |||
1 | #ifndef __UM_FIXMAP_H | ||
2 | #define __UM_FIXMAP_H | ||
3 | |||
4 | #include <asm/processor.h> | ||
5 | #include <asm/system.h> | ||
6 | #include <asm/kmap_types.h> | ||
7 | #include <asm/archparam.h> | ||
8 | #include <asm/page.h> | ||
9 | |||
10 | /* | ||
11 | * Here we define all the compile-time 'special' virtual | ||
12 | * addresses. The point is to have a constant address at | ||
13 | * compile time, but to set the physical address only | ||
14 | * in the boot process. We allocate these special addresses | ||
15 | * from the end of virtual memory (0xfffff000) backwards. | ||
16 | * Also this lets us do fail-safe vmalloc(), we | ||
17 | * can guarantee that these special addresses and | ||
18 | * vmalloc()-ed addresses never overlap. | ||
19 | * | ||
20 | * these 'compile-time allocated' memory buffers are | ||
21 | * fixed-size 4k pages. (or larger if used with an increment | ||
22 | * highger than 1) use fixmap_set(idx,phys) to associate | ||
23 | * physical memory with fixmap indices. | ||
24 | * | ||
25 | * TLB entries of such buffers will not be flushed across | ||
26 | * task switches. | ||
27 | */ | ||
28 | |||
29 | /* | ||
30 | * on UP currently we will have no trace of the fixmap mechanizm, | ||
31 | * no page table allocations, etc. This might change in the | ||
32 | * future, say framebuffers for the console driver(s) could be | ||
33 | * fix-mapped? | ||
34 | */ | ||
35 | enum fixed_addresses { | ||
36 | #ifdef CONFIG_HIGHMEM | ||
37 | FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */ | ||
38 | FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1, | ||
39 | #endif | ||
40 | __end_of_fixed_addresses | ||
41 | }; | ||
42 | |||
43 | extern void __set_fixmap (enum fixed_addresses idx, | ||
44 | unsigned long phys, pgprot_t flags); | ||
45 | |||
46 | #define set_fixmap(idx, phys) \ | ||
47 | __set_fixmap(idx, phys, PAGE_KERNEL) | ||
48 | /* | ||
49 | * Some hardware wants to get fixmapped without caching. | ||
50 | */ | ||
51 | #define set_fixmap_nocache(idx, phys) \ | ||
52 | __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE) | ||
53 | /* | ||
54 | * used by vmalloc.c. | ||
55 | * | ||
56 | * Leave one empty page between vmalloc'ed areas and | ||
57 | * the start of the fixmap, and leave one page empty | ||
58 | * at the top of mem.. | ||
59 | */ | ||
60 | |||
61 | #define FIXADDR_TOP (TASK_SIZE - 2 * PAGE_SIZE) | ||
62 | #define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT) | ||
63 | #define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) | ||
64 | |||
65 | #define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) | ||
66 | #define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) | ||
67 | |||
68 | extern void __this_fixmap_does_not_exist(void); | ||
69 | |||
70 | /* | ||
71 | * 'index to address' translation. If anyone tries to use the idx | ||
72 | * directly without tranlation, we catch the bug with a NULL-deference | ||
73 | * kernel oops. Illegal ranges of incoming indices are caught too. | ||
74 | */ | ||
75 | static inline unsigned long fix_to_virt(const unsigned int idx) | ||
76 | { | ||
77 | /* | ||
78 | * this branch gets completely eliminated after inlining, | ||
79 | * except when someone tries to use fixaddr indices in an | ||
80 | * illegal way. (such as mixing up address types or using | ||
81 | * out-of-range indices). | ||
82 | * | ||
83 | * If it doesn't get removed, the linker will complain | ||
84 | * loudly with a reasonably clear error message.. | ||
85 | */ | ||
86 | if (idx >= __end_of_fixed_addresses) | ||
87 | __this_fixmap_does_not_exist(); | ||
88 | |||
89 | return __fix_to_virt(idx); | ||
90 | } | ||
91 | |||
92 | static inline unsigned long virt_to_fix(const unsigned long vaddr) | ||
93 | { | ||
94 | BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START); | ||
95 | return __virt_to_fix(vaddr); | ||
96 | } | ||
97 | |||
98 | #endif | ||
diff --git a/include/asm-um/floppy.h b/include/asm-um/floppy.h deleted file mode 100644 index 453e7415fb6f..000000000000 --- a/include/asm-um/floppy.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_FLOPPY_H | ||
2 | #define __UM_FLOPPY_H | ||
3 | |||
4 | #include "asm/arch/floppy.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/frame.h b/include/asm-um/frame.h deleted file mode 100644 index 8a8c1cb415b4..000000000000 --- a/include/asm-um/frame.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_FRAME_I | ||
2 | #define __UM_FRAME_I | ||
3 | |||
4 | #include "asm/arch/frame.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/futex.h b/include/asm-um/futex.h deleted file mode 100644 index 6a332a9f099c..000000000000 --- a/include/asm-um/futex.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _ASM_FUTEX_H | ||
2 | #define _ASM_FUTEX_H | ||
3 | |||
4 | #include <asm-generic/futex.h> | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/hardirq.h b/include/asm-um/hardirq.h deleted file mode 100644 index 313ebb8a2566..000000000000 --- a/include/asm-um/hardirq.h +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | /* (c) 2004 cw@f00f.org, GPLv2 blah blah */ | ||
2 | |||
3 | #ifndef __ASM_UM_HARDIRQ_H | ||
4 | #define __ASM_UM_HARDIRQ_H | ||
5 | |||
6 | #include <linux/threads.h> | ||
7 | #include <linux/irq.h> | ||
8 | |||
9 | /* NOTE: When SMP works again we might want to make this | ||
10 | * ____cacheline_aligned or maybe use per_cpu state? --cw */ | ||
11 | typedef struct { | ||
12 | unsigned int __softirq_pending; | ||
13 | } irq_cpustat_t; | ||
14 | |||
15 | #include <linux/irq_cpustat.h> | ||
16 | |||
17 | /* As this would be very strange for UML to get we BUG() after the | ||
18 | * printk. */ | ||
19 | static inline void ack_bad_irq(unsigned int irq) | ||
20 | { | ||
21 | printk(KERN_ERR "unexpected IRQ %02x\n", irq); | ||
22 | BUG(); | ||
23 | } | ||
24 | |||
25 | #endif /* __ASM_UM_HARDIRQ_H */ | ||
diff --git a/include/asm-um/highmem.h b/include/asm-um/highmem.h deleted file mode 100644 index 36974cb8abc7..000000000000 --- a/include/asm-um/highmem.h +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | #ifndef __UM_HIGHMEM_H | ||
2 | #define __UM_HIGHMEM_H | ||
3 | |||
4 | #include "asm/page.h" | ||
5 | #include "asm/fixmap.h" | ||
6 | #include "asm/arch/highmem.h" | ||
7 | |||
8 | #undef PKMAP_BASE | ||
9 | |||
10 | #define PKMAP_BASE ((FIXADDR_START - LAST_PKMAP * PAGE_SIZE) & PMD_MASK) | ||
11 | |||
12 | #endif | ||
diff --git a/include/asm-um/host_ldt-i386.h b/include/asm-um/host_ldt-i386.h deleted file mode 100644 index b27cb0a9dd30..000000000000 --- a/include/asm-um/host_ldt-i386.h +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | #ifndef __ASM_HOST_LDT_I386_H | ||
2 | #define __ASM_HOST_LDT_I386_H | ||
3 | |||
4 | #include "asm/arch/ldt.h" | ||
5 | |||
6 | /* | ||
7 | * macros stolen from include/asm-i386/desc.h | ||
8 | */ | ||
9 | #define LDT_entry_a(info) \ | ||
10 | ((((info)->base_addr & 0x0000ffff) << 16) | ((info)->limit & 0x0ffff)) | ||
11 | |||
12 | #define LDT_entry_b(info) \ | ||
13 | (((info)->base_addr & 0xff000000) | \ | ||
14 | (((info)->base_addr & 0x00ff0000) >> 16) | \ | ||
15 | ((info)->limit & 0xf0000) | \ | ||
16 | (((info)->read_exec_only ^ 1) << 9) | \ | ||
17 | ((info)->contents << 10) | \ | ||
18 | (((info)->seg_not_present ^ 1) << 15) | \ | ||
19 | ((info)->seg_32bit << 22) | \ | ||
20 | ((info)->limit_in_pages << 23) | \ | ||
21 | ((info)->useable << 20) | \ | ||
22 | 0x7000) | ||
23 | |||
24 | #define LDT_empty(info) (\ | ||
25 | (info)->base_addr == 0 && \ | ||
26 | (info)->limit == 0 && \ | ||
27 | (info)->contents == 0 && \ | ||
28 | (info)->read_exec_only == 1 && \ | ||
29 | (info)->seg_32bit == 0 && \ | ||
30 | (info)->limit_in_pages == 0 && \ | ||
31 | (info)->seg_not_present == 1 && \ | ||
32 | (info)->useable == 0 ) | ||
33 | |||
34 | #endif | ||
diff --git a/include/asm-um/host_ldt-x86_64.h b/include/asm-um/host_ldt-x86_64.h deleted file mode 100644 index 74a63f7d9a90..000000000000 --- a/include/asm-um/host_ldt-x86_64.h +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | #ifndef __ASM_HOST_LDT_X86_64_H | ||
2 | #define __ASM_HOST_LDT_X86_64_H | ||
3 | |||
4 | #include "asm/arch/ldt.h" | ||
5 | |||
6 | /* | ||
7 | * macros stolen from include/asm-x86_64/desc.h | ||
8 | */ | ||
9 | #define LDT_entry_a(info) \ | ||
10 | ((((info)->base_addr & 0x0000ffff) << 16) | ((info)->limit & 0x0ffff)) | ||
11 | |||
12 | /* Don't allow setting of the lm bit. It is useless anyways because | ||
13 | * 64bit system calls require __USER_CS. */ | ||
14 | #define LDT_entry_b(info) \ | ||
15 | (((info)->base_addr & 0xff000000) | \ | ||
16 | (((info)->base_addr & 0x00ff0000) >> 16) | \ | ||
17 | ((info)->limit & 0xf0000) | \ | ||
18 | (((info)->read_exec_only ^ 1) << 9) | \ | ||
19 | ((info)->contents << 10) | \ | ||
20 | (((info)->seg_not_present ^ 1) << 15) | \ | ||
21 | ((info)->seg_32bit << 22) | \ | ||
22 | ((info)->limit_in_pages << 23) | \ | ||
23 | ((info)->useable << 20) | \ | ||
24 | /* ((info)->lm << 21) | */ \ | ||
25 | 0x7000) | ||
26 | |||
27 | #define LDT_empty(info) (\ | ||
28 | (info)->base_addr == 0 && \ | ||
29 | (info)->limit == 0 && \ | ||
30 | (info)->contents == 0 && \ | ||
31 | (info)->read_exec_only == 1 && \ | ||
32 | (info)->seg_32bit == 0 && \ | ||
33 | (info)->limit_in_pages == 0 && \ | ||
34 | (info)->seg_not_present == 1 && \ | ||
35 | (info)->useable == 0 && \ | ||
36 | (info)->lm == 0) | ||
37 | |||
38 | #endif | ||
diff --git a/include/asm-um/hw_irq.h b/include/asm-um/hw_irq.h deleted file mode 100644 index 1cf84cf5f21a..000000000000 --- a/include/asm-um/hw_irq.h +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | #ifndef _ASM_UM_HW_IRQ_H | ||
2 | #define _ASM_UM_HW_IRQ_H | ||
3 | |||
4 | #include "asm/irq.h" | ||
5 | #include "asm/archparam.h" | ||
6 | |||
7 | #endif | ||
diff --git a/include/asm-um/ide.h b/include/asm-um/ide.h deleted file mode 100644 index 3d1ccebcfbaf..000000000000 --- a/include/asm-um/ide.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_IDE_H | ||
2 | #define __UM_IDE_H | ||
3 | |||
4 | #include "asm/arch/ide.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/io.h b/include/asm-um/io.h deleted file mode 100644 index 44e8b8c772ae..000000000000 --- a/include/asm-um/io.h +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | #ifndef __UM_IO_H | ||
2 | #define __UM_IO_H | ||
3 | |||
4 | #include "asm/page.h" | ||
5 | |||
6 | #define IO_SPACE_LIMIT 0xdeadbeef /* Sure hope nothing uses this */ | ||
7 | |||
8 | static inline int inb(unsigned long i) { return(0); } | ||
9 | static inline void outb(char c, unsigned long i) { } | ||
10 | |||
11 | /* | ||
12 | * Change virtual addresses to physical addresses and vv. | ||
13 | * These are pretty trivial | ||
14 | */ | ||
15 | static inline unsigned long virt_to_phys(volatile void * address) | ||
16 | { | ||
17 | return __pa((void *) address); | ||
18 | } | ||
19 | |||
20 | static inline void * phys_to_virt(unsigned long address) | ||
21 | { | ||
22 | return __va(address); | ||
23 | } | ||
24 | |||
25 | /* | ||
26 | * Convert a physical pointer to a virtual kernel pointer for /dev/mem | ||
27 | * access | ||
28 | */ | ||
29 | #define xlate_dev_mem_ptr(p) __va(p) | ||
30 | |||
31 | /* | ||
32 | * Convert a virtual cached pointer to an uncached pointer | ||
33 | */ | ||
34 | #define xlate_dev_kmem_ptr(p) p | ||
35 | |||
36 | static inline void writeb(unsigned char b, volatile void __iomem *addr) | ||
37 | { | ||
38 | *(volatile unsigned char __force *) addr = b; | ||
39 | } | ||
40 | static inline void writew(unsigned short b, volatile void __iomem *addr) | ||
41 | { | ||
42 | *(volatile unsigned short __force *) addr = b; | ||
43 | } | ||
44 | static inline void writel(unsigned int b, volatile void __iomem *addr) | ||
45 | { | ||
46 | *(volatile unsigned int __force *) addr = b; | ||
47 | } | ||
48 | static inline void writeq(unsigned int b, volatile void __iomem *addr) | ||
49 | { | ||
50 | *(volatile unsigned long long __force *) addr = b; | ||
51 | } | ||
52 | #define __raw_writeb writeb | ||
53 | #define __raw_writew writew | ||
54 | #define __raw_writel writel | ||
55 | #define __raw_writeq writeq | ||
56 | |||
57 | #endif | ||
diff --git a/include/asm-um/ioctl.h b/include/asm-um/ioctl.h deleted file mode 100644 index cc22157346db..000000000000 --- a/include/asm-um/ioctl.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_IOCTL_H | ||
2 | #define __UM_IOCTL_H | ||
3 | |||
4 | #include "asm/arch/ioctl.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/ioctls.h b/include/asm-um/ioctls.h deleted file mode 100644 index 9a1a017de6a7..000000000000 --- a/include/asm-um/ioctls.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_IOCTLS_H | ||
2 | #define __UM_IOCTLS_H | ||
3 | |||
4 | #include "asm/arch/ioctls.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/ipcbuf.h b/include/asm-um/ipcbuf.h deleted file mode 100644 index bb2ad31dc434..000000000000 --- a/include/asm-um/ipcbuf.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_IPCBUF_H | ||
2 | #define __UM_IPCBUF_H | ||
3 | |||
4 | #include "asm/arch/ipcbuf.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/irq.h b/include/asm-um/irq.h deleted file mode 100644 index 4a2037f8204b..000000000000 --- a/include/asm-um/irq.h +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | #ifndef __UM_IRQ_H | ||
2 | #define __UM_IRQ_H | ||
3 | |||
4 | #define TIMER_IRQ 0 | ||
5 | #define UMN_IRQ 1 | ||
6 | #define CONSOLE_IRQ 2 | ||
7 | #define CONSOLE_WRITE_IRQ 3 | ||
8 | #define UBD_IRQ 4 | ||
9 | #define UM_ETH_IRQ 5 | ||
10 | #define SSL_IRQ 6 | ||
11 | #define SSL_WRITE_IRQ 7 | ||
12 | #define ACCEPT_IRQ 8 | ||
13 | #define MCONSOLE_IRQ 9 | ||
14 | #define WINCH_IRQ 10 | ||
15 | #define SIGIO_WRITE_IRQ 11 | ||
16 | #define TELNETD_IRQ 12 | ||
17 | #define XTERM_IRQ 13 | ||
18 | #define RANDOM_IRQ 14 | ||
19 | |||
20 | #define LAST_IRQ RANDOM_IRQ | ||
21 | #define NR_IRQS (LAST_IRQ + 1) | ||
22 | |||
23 | #endif | ||
diff --git a/include/asm-um/irq_regs.h b/include/asm-um/irq_regs.h deleted file mode 100644 index 3dd9c0b70270..000000000000 --- a/include/asm-um/irq_regs.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/irq_regs.h> | ||
diff --git a/include/asm-um/irq_vectors.h b/include/asm-um/irq_vectors.h deleted file mode 100644 index 62ddba6fc733..000000000000 --- a/include/asm-um/irq_vectors.h +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __UM_IRQ_VECTORS_H | ||
7 | #define __UM_IRQ_VECTORS_H | ||
8 | |||
9 | #endif | ||
10 | |||
11 | /* | ||
12 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
13 | * Emacs will notice this stuff at the end of the file and automatically | ||
14 | * adjust the settings for this buffer only. This must remain at the end | ||
15 | * of the file. | ||
16 | * --------------------------------------------------------------------------- | ||
17 | * Local variables: | ||
18 | * c-file-style: "linux" | ||
19 | * End: | ||
20 | */ | ||
diff --git a/include/asm-um/irqflags.h b/include/asm-um/irqflags.h deleted file mode 100644 index 659b9abdfdba..000000000000 --- a/include/asm-um/irqflags.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_IRQFLAGS_H | ||
2 | #define __UM_IRQFLAGS_H | ||
3 | |||
4 | /* Empty for now */ | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/kdebug.h b/include/asm-um/kdebug.h deleted file mode 100644 index 6ece1b037665..000000000000 --- a/include/asm-um/kdebug.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/kdebug.h> | ||
diff --git a/include/asm-um/kmap_types.h b/include/asm-um/kmap_types.h deleted file mode 100644 index 6c03acdb4405..000000000000 --- a/include/asm-um/kmap_types.h +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __UM_KMAP_TYPES_H | ||
7 | #define __UM_KMAP_TYPES_H | ||
8 | |||
9 | /* No more #include "asm/arch/kmap_types.h" ! */ | ||
10 | |||
11 | enum km_type { | ||
12 | KM_BOUNCE_READ, | ||
13 | KM_SKB_SUNRPC_DATA, | ||
14 | KM_SKB_DATA_SOFTIRQ, | ||
15 | KM_USER0, | ||
16 | KM_USER1, | ||
17 | KM_UML_USERCOPY, /* UML specific, for copy_*_user - used in do_op_one_page */ | ||
18 | KM_BIO_SRC_IRQ, | ||
19 | KM_BIO_DST_IRQ, | ||
20 | KM_PTE0, | ||
21 | KM_PTE1, | ||
22 | KM_IRQ0, | ||
23 | KM_IRQ1, | ||
24 | KM_SOFTIRQ0, | ||
25 | KM_SOFTIRQ1, | ||
26 | KM_TYPE_NR | ||
27 | }; | ||
28 | |||
29 | #endif | ||
diff --git a/include/asm-um/ldt.h b/include/asm-um/ldt.h deleted file mode 100644 index 52af512f5e7d..000000000000 --- a/include/asm-um/ldt.h +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2004 Fujitsu Siemens Computers GmbH | ||
3 | * Licensed under the GPL | ||
4 | * | ||
5 | * Author: Bodo Stroesser <bstroesser@fujitsu-siemens.com> | ||
6 | */ | ||
7 | |||
8 | #ifndef __ASM_LDT_H | ||
9 | #define __ASM_LDT_H | ||
10 | |||
11 | #include <linux/mutex.h> | ||
12 | #include "asm/host_ldt.h" | ||
13 | |||
14 | extern void ldt_host_info(void); | ||
15 | |||
16 | #define LDT_PAGES_MAX \ | ||
17 | ((LDT_ENTRIES * LDT_ENTRY_SIZE)/PAGE_SIZE) | ||
18 | #define LDT_ENTRIES_PER_PAGE \ | ||
19 | (PAGE_SIZE/LDT_ENTRY_SIZE) | ||
20 | #define LDT_DIRECT_ENTRIES \ | ||
21 | ((LDT_PAGES_MAX*sizeof(void *))/LDT_ENTRY_SIZE) | ||
22 | |||
23 | struct ldt_entry { | ||
24 | __u32 a; | ||
25 | __u32 b; | ||
26 | }; | ||
27 | |||
28 | typedef struct uml_ldt { | ||
29 | int entry_count; | ||
30 | struct mutex lock; | ||
31 | union { | ||
32 | struct ldt_entry * pages[LDT_PAGES_MAX]; | ||
33 | struct ldt_entry entries[LDT_DIRECT_ENTRIES]; | ||
34 | } u; | ||
35 | } uml_ldt_t; | ||
36 | |||
37 | #endif | ||
diff --git a/include/asm-um/linkage.h b/include/asm-um/linkage.h deleted file mode 100644 index 7dfce37adc8b..000000000000 --- a/include/asm-um/linkage.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __ASM_UM_LINKAGE_H | ||
2 | #define __ASM_UM_LINKAGE_H | ||
3 | |||
4 | #include "asm/arch/linkage.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/local.h b/include/asm-um/local.h deleted file mode 100644 index 9a280c5bb609..000000000000 --- a/include/asm-um/local.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_LOCAL_H | ||
2 | #define __UM_LOCAL_H | ||
3 | |||
4 | #include "asm/arch/local.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/locks.h b/include/asm-um/locks.h deleted file mode 100644 index f80030a3ef5a..000000000000 --- a/include/asm-um/locks.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_LOCKS_H | ||
2 | #define __UM_LOCKS_H | ||
3 | |||
4 | #include "asm/arch/locks.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/mca_dma.h b/include/asm-um/mca_dma.h deleted file mode 100644 index e492e4ec1392..000000000000 --- a/include/asm-um/mca_dma.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef mca___UM_DMA_H | ||
2 | #define mca___UM_DMA_H | ||
3 | |||
4 | #include "asm/arch/mca_dma.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/mman.h b/include/asm-um/mman.h deleted file mode 100644 index b09ed523019b..000000000000 --- a/include/asm-um/mman.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_MMAN_H | ||
2 | #define __UM_MMAN_H | ||
3 | |||
4 | #include "asm/arch/mman.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/mmu.h b/include/asm-um/mmu.h deleted file mode 100644 index 2cf35c21d694..000000000000 --- a/include/asm-um/mmu.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __MMU_H | ||
7 | #define __MMU_H | ||
8 | |||
9 | #include "um_mmu.h" | ||
10 | |||
11 | #endif | ||
12 | |||
13 | /* | ||
14 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
15 | * Emacs will notice this stuff at the end of the file and automatically | ||
16 | * adjust the settings for this buffer only. This must remain at the end | ||
17 | * of the file. | ||
18 | * --------------------------------------------------------------------------- | ||
19 | * Local variables: | ||
20 | * c-file-style: "linux" | ||
21 | * End: | ||
22 | */ | ||
diff --git a/include/asm-um/mmu_context.h b/include/asm-um/mmu_context.h deleted file mode 100644 index 54f42e8b0105..000000000000 --- a/include/asm-um/mmu_context.h +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __UM_MMU_CONTEXT_H | ||
7 | #define __UM_MMU_CONTEXT_H | ||
8 | |||
9 | #include "linux/sched.h" | ||
10 | #include "um_mmu.h" | ||
11 | |||
12 | extern void arch_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm); | ||
13 | extern void arch_exit_mmap(struct mm_struct *mm); | ||
14 | |||
15 | #define get_mmu_context(task) do ; while(0) | ||
16 | #define activate_context(tsk) do ; while(0) | ||
17 | |||
18 | #define deactivate_mm(tsk,mm) do { } while (0) | ||
19 | |||
20 | extern void force_flush_all(void); | ||
21 | |||
22 | static inline void activate_mm(struct mm_struct *old, struct mm_struct *new) | ||
23 | { | ||
24 | /* | ||
25 | * This is called by fs/exec.c and sys_unshare() | ||
26 | * when the new ->mm is used for the first time. | ||
27 | */ | ||
28 | __switch_mm(&new->context.id); | ||
29 | arch_dup_mmap(old, new); | ||
30 | } | ||
31 | |||
32 | static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, | ||
33 | struct task_struct *tsk) | ||
34 | { | ||
35 | unsigned cpu = smp_processor_id(); | ||
36 | |||
37 | if(prev != next){ | ||
38 | cpu_clear(cpu, prev->cpu_vm_mask); | ||
39 | cpu_set(cpu, next->cpu_vm_mask); | ||
40 | if(next != &init_mm) | ||
41 | __switch_mm(&next->context.id); | ||
42 | } | ||
43 | } | ||
44 | |||
45 | static inline void enter_lazy_tlb(struct mm_struct *mm, | ||
46 | struct task_struct *tsk) | ||
47 | { | ||
48 | } | ||
49 | |||
50 | extern int init_new_context(struct task_struct *task, struct mm_struct *mm); | ||
51 | |||
52 | extern void destroy_context(struct mm_struct *mm); | ||
53 | |||
54 | #endif | ||
diff --git a/include/asm-um/module-generic.h b/include/asm-um/module-generic.h deleted file mode 100644 index 5a265f56b174..000000000000 --- a/include/asm-um/module-generic.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_MODULE_GENERIC_H | ||
2 | #define __UM_MODULE_GENERIC_H | ||
3 | |||
4 | #include "asm/arch/module.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/module-i386.h b/include/asm-um/module-i386.h deleted file mode 100644 index 5ead4a0b2e35..000000000000 --- a/include/asm-um/module-i386.h +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | #ifndef __UM_MODULE_I386_H | ||
2 | #define __UM_MODULE_I386_H | ||
3 | |||
4 | /* UML is simple */ | ||
5 | struct mod_arch_specific | ||
6 | { | ||
7 | }; | ||
8 | |||
9 | #define Elf_Shdr Elf32_Shdr | ||
10 | #define Elf_Sym Elf32_Sym | ||
11 | #define Elf_Ehdr Elf32_Ehdr | ||
12 | |||
13 | #endif | ||
diff --git a/include/asm-um/module-x86_64.h b/include/asm-um/module-x86_64.h deleted file mode 100644 index 35b5491d3e96..000000000000 --- a/include/asm-um/module-x86_64.h +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright 2003 PathScale, Inc. | ||
3 | * | ||
4 | * Licensed under the GPL | ||
5 | */ | ||
6 | |||
7 | #ifndef __UM_MODULE_X86_64_H | ||
8 | #define __UM_MODULE_X86_64_H | ||
9 | |||
10 | /* UML is simple */ | ||
11 | struct mod_arch_specific | ||
12 | { | ||
13 | }; | ||
14 | |||
15 | #define Elf_Shdr Elf64_Shdr | ||
16 | #define Elf_Sym Elf64_Sym | ||
17 | #define Elf_Ehdr Elf64_Ehdr | ||
18 | |||
19 | #endif | ||
20 | |||
21 | /* | ||
22 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
23 | * Emacs will notice this stuff at the end of the file and automatically | ||
24 | * adjust the settings for this buffer only. This must remain at the end | ||
25 | * of the file. | ||
26 | * --------------------------------------------------------------------------- | ||
27 | * Local variables: | ||
28 | * c-file-style: "linux" | ||
29 | * End: | ||
30 | */ | ||
diff --git a/include/asm-um/msgbuf.h b/include/asm-um/msgbuf.h deleted file mode 100644 index 8ce8c30d5377..000000000000 --- a/include/asm-um/msgbuf.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_MSGBUF_H | ||
2 | #define __UM_MSGBUF_H | ||
3 | |||
4 | #include "asm/arch/msgbuf.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/mtrr.h b/include/asm-um/mtrr.h deleted file mode 100644 index 5e9cd12c578d..000000000000 --- a/include/asm-um/mtrr.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_MTRR_H | ||
2 | #define __UM_MTRR_H | ||
3 | |||
4 | #include "asm/arch/mtrr.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/mutex.h b/include/asm-um/mutex.h deleted file mode 100644 index 458c1f7fbc18..000000000000 --- a/include/asm-um/mutex.h +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | /* | ||
2 | * Pull in the generic implementation for the mutex fastpath. | ||
3 | * | ||
4 | * TODO: implement optimized primitives instead, or leave the generic | ||
5 | * implementation in place, or pick the atomic_xchg() based generic | ||
6 | * implementation. (see asm-generic/mutex-xchg.h for details) | ||
7 | */ | ||
8 | |||
9 | #include <asm-generic/mutex-dec.h> | ||
diff --git a/include/asm-um/nops.h b/include/asm-um/nops.h deleted file mode 100644 index 814e9bf5dea6..000000000000 --- a/include/asm-um/nops.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_NOPS_H | ||
2 | #define __UM_NOPS_H | ||
3 | |||
4 | #include "asm/arch/nops.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/page.h b/include/asm-um/page.h deleted file mode 100644 index a6df1f13d732..000000000000 --- a/include/asm-um/page.h +++ /dev/null | |||
@@ -1,122 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com) | ||
3 | * Copyright 2003 PathScale, Inc. | ||
4 | * Licensed under the GPL | ||
5 | */ | ||
6 | |||
7 | #ifndef __UM_PAGE_H | ||
8 | #define __UM_PAGE_H | ||
9 | |||
10 | #include <linux/const.h> | ||
11 | |||
12 | /* PAGE_SHIFT determines the page size */ | ||
13 | #define PAGE_SHIFT 12 | ||
14 | #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) | ||
15 | #define PAGE_MASK (~(PAGE_SIZE-1)) | ||
16 | |||
17 | #ifndef __ASSEMBLY__ | ||
18 | |||
19 | struct page; | ||
20 | |||
21 | #include <linux/types.h> | ||
22 | #include <asm/vm-flags.h> | ||
23 | |||
24 | /* | ||
25 | * These are used to make use of C type-checking.. | ||
26 | */ | ||
27 | |||
28 | #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) | ||
29 | #define copy_page(to,from) memcpy((void *)(to), (void *)(from), PAGE_SIZE) | ||
30 | |||
31 | #define clear_user_page(page, vaddr, pg) clear_page(page) | ||
32 | #define copy_user_page(to, from, vaddr, pg) copy_page(to, from) | ||
33 | |||
34 | #if defined(CONFIG_3_LEVEL_PGTABLES) && !defined(CONFIG_64BIT) | ||
35 | |||
36 | typedef struct { unsigned long pte_low, pte_high; } pte_t; | ||
37 | typedef struct { unsigned long pmd; } pmd_t; | ||
38 | typedef struct { unsigned long pgd; } pgd_t; | ||
39 | #define pte_val(x) ((x).pte_low | ((unsigned long long) (x).pte_high << 32)) | ||
40 | |||
41 | #define pte_get_bits(pte, bits) ((pte).pte_low & (bits)) | ||
42 | #define pte_set_bits(pte, bits) ((pte).pte_low |= (bits)) | ||
43 | #define pte_clear_bits(pte, bits) ((pte).pte_low &= ~(bits)) | ||
44 | #define pte_copy(to, from) ({ (to).pte_high = (from).pte_high; \ | ||
45 | smp_wmb(); \ | ||
46 | (to).pte_low = (from).pte_low; }) | ||
47 | #define pte_is_zero(pte) (!((pte).pte_low & ~_PAGE_NEWPAGE) && !(pte).pte_high) | ||
48 | #define pte_set_val(pte, phys, prot) \ | ||
49 | ({ (pte).pte_high = (phys) >> 32; \ | ||
50 | (pte).pte_low = (phys) | pgprot_val(prot); }) | ||
51 | |||
52 | #define pmd_val(x) ((x).pmd) | ||
53 | #define __pmd(x) ((pmd_t) { (x) } ) | ||
54 | |||
55 | typedef unsigned long long pfn_t; | ||
56 | typedef unsigned long long phys_t; | ||
57 | |||
58 | #else | ||
59 | |||
60 | typedef struct { unsigned long pte; } pte_t; | ||
61 | typedef struct { unsigned long pgd; } pgd_t; | ||
62 | |||
63 | #ifdef CONFIG_3_LEVEL_PGTABLES | ||
64 | typedef struct { unsigned long pmd; } pmd_t; | ||
65 | #define pmd_val(x) ((x).pmd) | ||
66 | #define __pmd(x) ((pmd_t) { (x) } ) | ||
67 | #endif | ||
68 | |||
69 | #define pte_val(x) ((x).pte) | ||
70 | |||
71 | |||
72 | #define pte_get_bits(p, bits) ((p).pte & (bits)) | ||
73 | #define pte_set_bits(p, bits) ((p).pte |= (bits)) | ||
74 | #define pte_clear_bits(p, bits) ((p).pte &= ~(bits)) | ||
75 | #define pte_copy(to, from) ((to).pte = (from).pte) | ||
76 | #define pte_is_zero(p) (!((p).pte & ~_PAGE_NEWPAGE)) | ||
77 | #define pte_set_val(p, phys, prot) (p).pte = (phys | pgprot_val(prot)) | ||
78 | |||
79 | typedef unsigned long pfn_t; | ||
80 | typedef unsigned long phys_t; | ||
81 | |||
82 | #endif | ||
83 | |||
84 | typedef struct { unsigned long pgprot; } pgprot_t; | ||
85 | |||
86 | typedef struct page *pgtable_t; | ||
87 | |||
88 | #define pgd_val(x) ((x).pgd) | ||
89 | #define pgprot_val(x) ((x).pgprot) | ||
90 | |||
91 | #define __pte(x) ((pte_t) { (x) } ) | ||
92 | #define __pgd(x) ((pgd_t) { (x) } ) | ||
93 | #define __pgprot(x) ((pgprot_t) { (x) } ) | ||
94 | |||
95 | extern unsigned long uml_physmem; | ||
96 | |||
97 | #define PAGE_OFFSET (uml_physmem) | ||
98 | #define KERNELBASE PAGE_OFFSET | ||
99 | |||
100 | #define __va_space (8*1024*1024) | ||
101 | |||
102 | #include "mem.h" | ||
103 | |||
104 | /* Cast to unsigned long before casting to void * to avoid a warning from | ||
105 | * mmap_kmem about cutting a long long down to a void *. Not sure that | ||
106 | * casting is the right thing, but 32-bit UML can't have 64-bit virtual | ||
107 | * addresses | ||
108 | */ | ||
109 | #define __pa(virt) to_phys((void *) (unsigned long) (virt)) | ||
110 | #define __va(phys) to_virt((unsigned long) (phys)) | ||
111 | |||
112 | #define phys_to_pfn(p) ((pfn_t) ((p) >> PAGE_SHIFT)) | ||
113 | #define pfn_to_phys(pfn) ((phys_t) ((pfn) << PAGE_SHIFT)) | ||
114 | |||
115 | #define pfn_valid(pfn) ((pfn) < max_mapnr) | ||
116 | #define virt_addr_valid(v) pfn_valid(phys_to_pfn(__pa(v))) | ||
117 | |||
118 | #include <asm-generic/memory_model.h> | ||
119 | #include <asm-generic/page.h> | ||
120 | |||
121 | #endif /* __ASSEMBLY__ */ | ||
122 | #endif /* __UM_PAGE_H */ | ||
diff --git a/include/asm-um/page_offset.h b/include/asm-um/page_offset.h deleted file mode 100644 index 1c168dfbf359..000000000000 --- a/include/asm-um/page_offset.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #define PAGE_OFFSET_RAW (uml_physmem) | ||
diff --git a/include/asm-um/param.h b/include/asm-um/param.h deleted file mode 100644 index e44f4e60d16d..000000000000 --- a/include/asm-um/param.h +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | #ifndef _UM_PARAM_H | ||
2 | #define _UM_PARAM_H | ||
3 | |||
4 | #define EXEC_PAGESIZE 4096 | ||
5 | |||
6 | #ifndef NOGROUP | ||
7 | #define NOGROUP (-1) | ||
8 | #endif | ||
9 | |||
10 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ | ||
11 | |||
12 | #ifdef __KERNEL__ | ||
13 | #define HZ CONFIG_HZ | ||
14 | #define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | ||
15 | #define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */ | ||
16 | #else | ||
17 | #define HZ 100 | ||
18 | #endif | ||
19 | |||
20 | #endif | ||
diff --git a/include/asm-um/paravirt.h b/include/asm-um/paravirt.h deleted file mode 100644 index 9d6aaad80b5f..000000000000 --- a/include/asm-um/paravirt.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_PARAVIRT_H | ||
2 | #define __UM_PARAVIRT_H | ||
3 | |||
4 | #include "asm/arch/paravirt.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/pci.h b/include/asm-um/pci.h deleted file mode 100644 index 59923199cdc3..000000000000 --- a/include/asm-um/pci.h +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | #ifndef __UM_PCI_H | ||
2 | #define __UM_PCI_H | ||
3 | |||
4 | #define PCI_DMA_BUS_IS_PHYS (1) | ||
5 | #define pcibios_scan_all_fns(a, b) 0 | ||
6 | |||
7 | #endif | ||
diff --git a/include/asm-um/pda.h b/include/asm-um/pda.h deleted file mode 100644 index 0d8bf33ffd42..000000000000 --- a/include/asm-um/pda.h +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright 2003 PathScale, Inc. | ||
3 | * | ||
4 | * Licensed under the GPL | ||
5 | */ | ||
6 | |||
7 | #ifndef __UM_PDA_X86_64_H | ||
8 | #define __UM_PDA_X86_64_H | ||
9 | |||
10 | /* XXX */ | ||
11 | struct foo { | ||
12 | unsigned int __softirq_pending; | ||
13 | unsigned int __nmi_count; | ||
14 | }; | ||
15 | |||
16 | extern struct foo me; | ||
17 | |||
18 | #define read_pda(me) (&me) | ||
19 | |||
20 | #endif | ||
21 | |||
22 | /* | ||
23 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
24 | * Emacs will notice this stuff at the end of the file and automatically | ||
25 | * adjust the settings for this buffer only. This must remain at the end | ||
26 | * of the file. | ||
27 | * --------------------------------------------------------------------------- | ||
28 | * Local variables: | ||
29 | * c-file-style: "linux" | ||
30 | * End: | ||
31 | */ | ||
diff --git a/include/asm-um/percpu.h b/include/asm-um/percpu.h deleted file mode 100644 index 5723e2aab8e7..000000000000 --- a/include/asm-um/percpu.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_PERCPU_H | ||
2 | #define __UM_PERCPU_H | ||
3 | |||
4 | #include "asm/arch/percpu.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/pgalloc.h b/include/asm-um/pgalloc.h deleted file mode 100644 index 9062a6e72241..000000000000 --- a/include/asm-um/pgalloc.h +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com) | ||
3 | * Copyright 2003 PathScale, Inc. | ||
4 | * Derived from include/asm-i386/pgalloc.h and include/asm-i386/pgtable.h | ||
5 | * Licensed under the GPL | ||
6 | */ | ||
7 | |||
8 | #ifndef __UM_PGALLOC_H | ||
9 | #define __UM_PGALLOC_H | ||
10 | |||
11 | #include "linux/mm.h" | ||
12 | #include "asm/fixmap.h" | ||
13 | |||
14 | #define pmd_populate_kernel(mm, pmd, pte) \ | ||
15 | set_pmd(pmd, __pmd(_PAGE_TABLE + (unsigned long) __pa(pte))) | ||
16 | |||
17 | #define pmd_populate(mm, pmd, pte) \ | ||
18 | set_pmd(pmd, __pmd(_PAGE_TABLE + \ | ||
19 | ((unsigned long long)page_to_pfn(pte) << \ | ||
20 | (unsigned long long) PAGE_SHIFT))) | ||
21 | #define pmd_pgtable(pmd) pmd_page(pmd) | ||
22 | |||
23 | /* | ||
24 | * Allocate and free page tables. | ||
25 | */ | ||
26 | extern pgd_t *pgd_alloc(struct mm_struct *); | ||
27 | extern void pgd_free(struct mm_struct *mm, pgd_t *pgd); | ||
28 | |||
29 | extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long); | ||
30 | extern pgtable_t pte_alloc_one(struct mm_struct *, unsigned long); | ||
31 | |||
32 | static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) | ||
33 | { | ||
34 | free_page((unsigned long) pte); | ||
35 | } | ||
36 | |||
37 | static inline void pte_free(struct mm_struct *mm, pgtable_t pte) | ||
38 | { | ||
39 | pgtable_page_dtor(pte); | ||
40 | __free_page(pte); | ||
41 | } | ||
42 | |||
43 | #define __pte_free_tlb(tlb,pte) \ | ||
44 | do { \ | ||
45 | pgtable_page_dtor(pte); \ | ||
46 | tlb_remove_page((tlb),(pte)); \ | ||
47 | } while (0) | ||
48 | |||
49 | #ifdef CONFIG_3_LEVEL_PGTABLES | ||
50 | |||
51 | static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) | ||
52 | { | ||
53 | free_page((unsigned long)pmd); | ||
54 | } | ||
55 | |||
56 | #define __pmd_free_tlb(tlb,x) tlb_remove_page((tlb),virt_to_page(x)) | ||
57 | #endif | ||
58 | |||
59 | #define check_pgt_cache() do { } while (0) | ||
60 | |||
61 | #endif | ||
62 | |||
63 | /* | ||
64 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
65 | * Emacs will notice this stuff at the end of the file and automatically | ||
66 | * adjust the settings for this buffer only. This must remain at the end | ||
67 | * of the file. | ||
68 | * --------------------------------------------------------------------------- | ||
69 | * Local variables: | ||
70 | * c-file-style: "linux" | ||
71 | * End: | ||
72 | */ | ||
diff --git a/include/asm-um/pgtable-2level.h b/include/asm-um/pgtable-2level.h deleted file mode 100644 index f534b73e753e..000000000000 --- a/include/asm-um/pgtable-2level.h +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com) | ||
3 | * Copyright 2003 PathScale, Inc. | ||
4 | * Derived from include/asm-i386/pgtable.h | ||
5 | * Licensed under the GPL | ||
6 | */ | ||
7 | |||
8 | #ifndef __UM_PGTABLE_2LEVEL_H | ||
9 | #define __UM_PGTABLE_2LEVEL_H | ||
10 | |||
11 | #include <asm-generic/pgtable-nopmd.h> | ||
12 | |||
13 | /* PGDIR_SHIFT determines what a third-level page table entry can map */ | ||
14 | |||
15 | #define PGDIR_SHIFT 22 | ||
16 | #define PGDIR_SIZE (1UL << PGDIR_SHIFT) | ||
17 | #define PGDIR_MASK (~(PGDIR_SIZE-1)) | ||
18 | |||
19 | /* | ||
20 | * entries per page directory level: the i386 is two-level, so | ||
21 | * we don't really have any PMD directory physically. | ||
22 | */ | ||
23 | #define PTRS_PER_PTE 1024 | ||
24 | #define USER_PTRS_PER_PGD ((TASK_SIZE + (PGDIR_SIZE - 1)) / PGDIR_SIZE) | ||
25 | #define PTRS_PER_PGD 1024 | ||
26 | #define FIRST_USER_ADDRESS 0 | ||
27 | |||
28 | #define pte_ERROR(e) \ | ||
29 | printk("%s:%d: bad pte %p(%08lx).\n", __FILE__, __LINE__, &(e), \ | ||
30 | pte_val(e)) | ||
31 | #define pgd_ERROR(e) \ | ||
32 | printk("%s:%d: bad pgd %p(%08lx).\n", __FILE__, __LINE__, &(e), \ | ||
33 | pgd_val(e)) | ||
34 | |||
35 | static inline int pgd_newpage(pgd_t pgd) { return 0; } | ||
36 | static inline void pgd_mkuptodate(pgd_t pgd) { } | ||
37 | |||
38 | #define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval)) | ||
39 | |||
40 | #define pte_pfn(x) phys_to_pfn(pte_val(x)) | ||
41 | #define pfn_pte(pfn, prot) __pte(pfn_to_phys(pfn) | pgprot_val(prot)) | ||
42 | #define pfn_pmd(pfn, prot) __pmd(pfn_to_phys(pfn) | pgprot_val(prot)) | ||
43 | |||
44 | /* | ||
45 | * Bits 0 through 4 are taken | ||
46 | */ | ||
47 | #define PTE_FILE_MAX_BITS 27 | ||
48 | |||
49 | #define pte_to_pgoff(pte) (pte_val(pte) >> 5) | ||
50 | |||
51 | #define pgoff_to_pte(off) ((pte_t) { ((off) << 5) + _PAGE_FILE }) | ||
52 | |||
53 | #endif | ||
diff --git a/include/asm-um/pgtable-3level.h b/include/asm-um/pgtable-3level.h deleted file mode 100644 index 0446f456b428..000000000000 --- a/include/asm-um/pgtable-3level.h +++ /dev/null | |||
@@ -1,146 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright 2003 PathScale Inc | ||
3 | * Derived from include/asm-i386/pgtable.h | ||
4 | * Licensed under the GPL | ||
5 | */ | ||
6 | |||
7 | #ifndef __UM_PGTABLE_3LEVEL_H | ||
8 | #define __UM_PGTABLE_3LEVEL_H | ||
9 | |||
10 | #include <asm-generic/pgtable-nopud.h> | ||
11 | |||
12 | /* PGDIR_SHIFT determines what a third-level page table entry can map */ | ||
13 | |||
14 | #ifdef CONFIG_64BIT | ||
15 | #define PGDIR_SHIFT 30 | ||
16 | #else | ||
17 | #define PGDIR_SHIFT 31 | ||
18 | #endif | ||
19 | #define PGDIR_SIZE (1UL << PGDIR_SHIFT) | ||
20 | #define PGDIR_MASK (~(PGDIR_SIZE-1)) | ||
21 | |||
22 | /* PMD_SHIFT determines the size of the area a second-level page table can | ||
23 | * map | ||
24 | */ | ||
25 | |||
26 | #define PMD_SHIFT 21 | ||
27 | #define PMD_SIZE (1UL << PMD_SHIFT) | ||
28 | #define PMD_MASK (~(PMD_SIZE-1)) | ||
29 | |||
30 | /* | ||
31 | * entries per page directory level | ||
32 | */ | ||
33 | |||
34 | #define PTRS_PER_PTE 512 | ||
35 | #ifdef CONFIG_64BIT | ||
36 | #define PTRS_PER_PMD 512 | ||
37 | #define PTRS_PER_PGD 512 | ||
38 | #else | ||
39 | #define PTRS_PER_PMD 1024 | ||
40 | #define PTRS_PER_PGD 1024 | ||
41 | #endif | ||
42 | |||
43 | #define USER_PTRS_PER_PGD ((TASK_SIZE + (PGDIR_SIZE - 1)) / PGDIR_SIZE) | ||
44 | #define FIRST_USER_ADDRESS 0 | ||
45 | |||
46 | #define pte_ERROR(e) \ | ||
47 | printk("%s:%d: bad pte %p(%016lx).\n", __FILE__, __LINE__, &(e), \ | ||
48 | pte_val(e)) | ||
49 | #define pmd_ERROR(e) \ | ||
50 | printk("%s:%d: bad pmd %p(%016lx).\n", __FILE__, __LINE__, &(e), \ | ||
51 | pmd_val(e)) | ||
52 | #define pgd_ERROR(e) \ | ||
53 | printk("%s:%d: bad pgd %p(%016lx).\n", __FILE__, __LINE__, &(e), \ | ||
54 | pgd_val(e)) | ||
55 | |||
56 | #define pud_none(x) (!(pud_val(x) & ~_PAGE_NEWPAGE)) | ||
57 | #define pud_bad(x) ((pud_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE) | ||
58 | #define pud_present(x) (pud_val(x) & _PAGE_PRESENT) | ||
59 | #define pud_populate(mm, pud, pmd) \ | ||
60 | set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd))) | ||
61 | |||
62 | #ifdef CONFIG_64BIT | ||
63 | #define set_pud(pudptr, pudval) set_64bit((phys_t *) (pudptr), pud_val(pudval)) | ||
64 | #else | ||
65 | #define set_pud(pudptr, pudval) (*(pudptr) = (pudval)) | ||
66 | #endif | ||
67 | |||
68 | static inline int pgd_newpage(pgd_t pgd) | ||
69 | { | ||
70 | return(pgd_val(pgd) & _PAGE_NEWPAGE); | ||
71 | } | ||
72 | |||
73 | static inline void pgd_mkuptodate(pgd_t pgd) { pgd_val(pgd) &= ~_PAGE_NEWPAGE; } | ||
74 | |||
75 | #ifdef CONFIG_64BIT | ||
76 | #define set_pmd(pmdptr, pmdval) set_64bit((phys_t *) (pmdptr), pmd_val(pmdval)) | ||
77 | #else | ||
78 | #define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval)) | ||
79 | #endif | ||
80 | |||
81 | struct mm_struct; | ||
82 | extern pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address); | ||
83 | |||
84 | static inline void pud_clear (pud_t *pud) | ||
85 | { | ||
86 | set_pud(pud, __pud(_PAGE_NEWPAGE)); | ||
87 | } | ||
88 | |||
89 | #define pud_page(pud) phys_to_page(pud_val(pud) & PAGE_MASK) | ||
90 | #define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PAGE_MASK)) | ||
91 | |||
92 | /* Find an entry in the second-level page table.. */ | ||
93 | #define pmd_offset(pud, address) ((pmd_t *) pud_page_vaddr(*(pud)) + \ | ||
94 | pmd_index(address)) | ||
95 | |||
96 | static inline unsigned long pte_pfn(pte_t pte) | ||
97 | { | ||
98 | return phys_to_pfn(pte_val(pte)); | ||
99 | } | ||
100 | |||
101 | static inline pte_t pfn_pte(pfn_t page_nr, pgprot_t pgprot) | ||
102 | { | ||
103 | pte_t pte; | ||
104 | phys_t phys = pfn_to_phys(page_nr); | ||
105 | |||
106 | pte_set_val(pte, phys, pgprot); | ||
107 | return pte; | ||
108 | } | ||
109 | |||
110 | static inline pmd_t pfn_pmd(pfn_t page_nr, pgprot_t pgprot) | ||
111 | { | ||
112 | return __pmd((page_nr << PAGE_SHIFT) | pgprot_val(pgprot)); | ||
113 | } | ||
114 | |||
115 | /* | ||
116 | * Bits 0 through 3 are taken in the low part of the pte, | ||
117 | * put the 32 bits of offset into the high part. | ||
118 | */ | ||
119 | #define PTE_FILE_MAX_BITS 32 | ||
120 | |||
121 | #ifdef CONFIG_64BIT | ||
122 | |||
123 | #define pte_to_pgoff(p) ((p).pte >> 32) | ||
124 | |||
125 | #define pgoff_to_pte(off) ((pte_t) { ((off) << 32) | _PAGE_FILE }) | ||
126 | |||
127 | #else | ||
128 | |||
129 | #define pte_to_pgoff(pte) ((pte).pte_high) | ||
130 | |||
131 | #define pgoff_to_pte(off) ((pte_t) { _PAGE_FILE, (off) }) | ||
132 | |||
133 | #endif | ||
134 | |||
135 | #endif | ||
136 | |||
137 | /* | ||
138 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
139 | * Emacs will notice this stuff at the end of the file and automatically | ||
140 | * adjust the settings for this buffer only. This must remain at the end | ||
141 | * of the file. | ||
142 | * --------------------------------------------------------------------------- | ||
143 | * Local variables: | ||
144 | * c-file-style: "linux" | ||
145 | * End: | ||
146 | */ | ||
diff --git a/include/asm-um/pgtable.h b/include/asm-um/pgtable.h deleted file mode 100644 index 02db81b7b86e..000000000000 --- a/include/asm-um/pgtable.h +++ /dev/null | |||
@@ -1,358 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | ||
3 | * Copyright 2003 PathScale, Inc. | ||
4 | * Derived from include/asm-i386/pgtable.h | ||
5 | * Licensed under the GPL | ||
6 | */ | ||
7 | |||
8 | #ifndef __UM_PGTABLE_H | ||
9 | #define __UM_PGTABLE_H | ||
10 | |||
11 | #include <asm/fixmap.h> | ||
12 | |||
13 | #define _PAGE_PRESENT 0x001 | ||
14 | #define _PAGE_NEWPAGE 0x002 | ||
15 | #define _PAGE_NEWPROT 0x004 | ||
16 | #define _PAGE_RW 0x020 | ||
17 | #define _PAGE_USER 0x040 | ||
18 | #define _PAGE_ACCESSED 0x080 | ||
19 | #define _PAGE_DIRTY 0x100 | ||
20 | /* If _PAGE_PRESENT is clear, we use these: */ | ||
21 | #define _PAGE_FILE 0x008 /* nonlinear file mapping, saved PTE; unset:swap */ | ||
22 | #define _PAGE_PROTNONE 0x010 /* if the user mapped it with PROT_NONE; | ||
23 | pte_present gives true */ | ||
24 | |||
25 | #ifdef CONFIG_3_LEVEL_PGTABLES | ||
26 | #include "asm/pgtable-3level.h" | ||
27 | #else | ||
28 | #include "asm/pgtable-2level.h" | ||
29 | #endif | ||
30 | |||
31 | extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; | ||
32 | |||
33 | /* zero page used for uninitialized stuff */ | ||
34 | extern unsigned long *empty_zero_page; | ||
35 | |||
36 | #define pgtable_cache_init() do ; while (0) | ||
37 | |||
38 | /* Just any arbitrary offset to the start of the vmalloc VM area: the | ||
39 | * current 8MB value just means that there will be a 8MB "hole" after the | ||
40 | * physical memory until the kernel virtual memory starts. That means that | ||
41 | * any out-of-bounds memory accesses will hopefully be caught. | ||
42 | * The vmalloc() routines leaves a hole of 4kB between each vmalloced | ||
43 | * area for the same reason. ;) | ||
44 | */ | ||
45 | |||
46 | extern unsigned long end_iomem; | ||
47 | |||
48 | #define VMALLOC_OFFSET (__va_space) | ||
49 | #define VMALLOC_START ((end_iomem + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1)) | ||
50 | #ifdef CONFIG_HIGHMEM | ||
51 | # define VMALLOC_END (PKMAP_BASE-2*PAGE_SIZE) | ||
52 | #else | ||
53 | # define VMALLOC_END (FIXADDR_START-2*PAGE_SIZE) | ||
54 | #endif | ||
55 | |||
56 | #define _PAGE_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY) | ||
57 | #define _KERNPG_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY) | ||
58 | #define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY) | ||
59 | |||
60 | #define PAGE_NONE __pgprot(_PAGE_PROTNONE | _PAGE_ACCESSED) | ||
61 | #define PAGE_SHARED __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED) | ||
62 | #define PAGE_COPY __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED) | ||
63 | #define PAGE_READONLY __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED) | ||
64 | #define PAGE_KERNEL __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED) | ||
65 | |||
66 | /* | ||
67 | * The i386 can't do page protection for execute, and considers that the same | ||
68 | * are read. | ||
69 | * Also, write permissions imply read permissions. This is the closest we can | ||
70 | * get.. | ||
71 | */ | ||
72 | #define __P000 PAGE_NONE | ||
73 | #define __P001 PAGE_READONLY | ||
74 | #define __P010 PAGE_COPY | ||
75 | #define __P011 PAGE_COPY | ||
76 | #define __P100 PAGE_READONLY | ||
77 | #define __P101 PAGE_READONLY | ||
78 | #define __P110 PAGE_COPY | ||
79 | #define __P111 PAGE_COPY | ||
80 | |||
81 | #define __S000 PAGE_NONE | ||
82 | #define __S001 PAGE_READONLY | ||
83 | #define __S010 PAGE_SHARED | ||
84 | #define __S011 PAGE_SHARED | ||
85 | #define __S100 PAGE_READONLY | ||
86 | #define __S101 PAGE_READONLY | ||
87 | #define __S110 PAGE_SHARED | ||
88 | #define __S111 PAGE_SHARED | ||
89 | |||
90 | /* | ||
91 | * ZERO_PAGE is a global shared page that is always zero: used | ||
92 | * for zero-mapped memory areas etc.. | ||
93 | */ | ||
94 | #define ZERO_PAGE(vaddr) virt_to_page(empty_zero_page) | ||
95 | |||
96 | #define pte_clear(mm,addr,xp) pte_set_val(*(xp), (phys_t) 0, __pgprot(_PAGE_NEWPAGE)) | ||
97 | |||
98 | #define pmd_none(x) (!((unsigned long)pmd_val(x) & ~_PAGE_NEWPAGE)) | ||
99 | #define pmd_bad(x) ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE) | ||
100 | |||
101 | #define pmd_present(x) (pmd_val(x) & _PAGE_PRESENT) | ||
102 | #define pmd_clear(xp) do { pmd_val(*(xp)) = _PAGE_NEWPAGE; } while (0) | ||
103 | |||
104 | #define pmd_newpage(x) (pmd_val(x) & _PAGE_NEWPAGE) | ||
105 | #define pmd_mkuptodate(x) (pmd_val(x) &= ~_PAGE_NEWPAGE) | ||
106 | |||
107 | #define pud_newpage(x) (pud_val(x) & _PAGE_NEWPAGE) | ||
108 | #define pud_mkuptodate(x) (pud_val(x) &= ~_PAGE_NEWPAGE) | ||
109 | |||
110 | #define pmd_page(pmd) phys_to_page(pmd_val(pmd) & PAGE_MASK) | ||
111 | |||
112 | #define pte_page(x) pfn_to_page(pte_pfn(x)) | ||
113 | |||
114 | #define pte_present(x) pte_get_bits(x, (_PAGE_PRESENT | _PAGE_PROTNONE)) | ||
115 | |||
116 | /* | ||
117 | * ================================= | ||
118 | * Flags checking section. | ||
119 | * ================================= | ||
120 | */ | ||
121 | |||
122 | static inline int pte_none(pte_t pte) | ||
123 | { | ||
124 | return pte_is_zero(pte); | ||
125 | } | ||
126 | |||
127 | /* | ||
128 | * The following only work if pte_present() is true. | ||
129 | * Undefined behaviour if not.. | ||
130 | */ | ||
131 | static inline int pte_read(pte_t pte) | ||
132 | { | ||
133 | return((pte_get_bits(pte, _PAGE_USER)) && | ||
134 | !(pte_get_bits(pte, _PAGE_PROTNONE))); | ||
135 | } | ||
136 | |||
137 | static inline int pte_exec(pte_t pte){ | ||
138 | return((pte_get_bits(pte, _PAGE_USER)) && | ||
139 | !(pte_get_bits(pte, _PAGE_PROTNONE))); | ||
140 | } | ||
141 | |||
142 | static inline int pte_write(pte_t pte) | ||
143 | { | ||
144 | return((pte_get_bits(pte, _PAGE_RW)) && | ||
145 | !(pte_get_bits(pte, _PAGE_PROTNONE))); | ||
146 | } | ||
147 | |||
148 | /* | ||
149 | * The following only works if pte_present() is not true. | ||
150 | */ | ||
151 | static inline int pte_file(pte_t pte) | ||
152 | { | ||
153 | return pte_get_bits(pte, _PAGE_FILE); | ||
154 | } | ||
155 | |||
156 | static inline int pte_dirty(pte_t pte) | ||
157 | { | ||
158 | return pte_get_bits(pte, _PAGE_DIRTY); | ||
159 | } | ||
160 | |||
161 | static inline int pte_young(pte_t pte) | ||
162 | { | ||
163 | return pte_get_bits(pte, _PAGE_ACCESSED); | ||
164 | } | ||
165 | |||
166 | static inline int pte_newpage(pte_t pte) | ||
167 | { | ||
168 | return pte_get_bits(pte, _PAGE_NEWPAGE); | ||
169 | } | ||
170 | |||
171 | static inline int pte_newprot(pte_t pte) | ||
172 | { | ||
173 | return(pte_present(pte) && (pte_get_bits(pte, _PAGE_NEWPROT))); | ||
174 | } | ||
175 | |||
176 | static inline int pte_special(pte_t pte) | ||
177 | { | ||
178 | return 0; | ||
179 | } | ||
180 | |||
181 | /* | ||
182 | * ================================= | ||
183 | * Flags setting section. | ||
184 | * ================================= | ||
185 | */ | ||
186 | |||
187 | static inline pte_t pte_mknewprot(pte_t pte) | ||
188 | { | ||
189 | pte_set_bits(pte, _PAGE_NEWPROT); | ||
190 | return(pte); | ||
191 | } | ||
192 | |||
193 | static inline pte_t pte_mkclean(pte_t pte) | ||
194 | { | ||
195 | pte_clear_bits(pte, _PAGE_DIRTY); | ||
196 | return(pte); | ||
197 | } | ||
198 | |||
199 | static inline pte_t pte_mkold(pte_t pte) | ||
200 | { | ||
201 | pte_clear_bits(pte, _PAGE_ACCESSED); | ||
202 | return(pte); | ||
203 | } | ||
204 | |||
205 | static inline pte_t pte_wrprotect(pte_t pte) | ||
206 | { | ||
207 | pte_clear_bits(pte, _PAGE_RW); | ||
208 | return(pte_mknewprot(pte)); | ||
209 | } | ||
210 | |||
211 | static inline pte_t pte_mkread(pte_t pte) | ||
212 | { | ||
213 | pte_set_bits(pte, _PAGE_USER); | ||
214 | return(pte_mknewprot(pte)); | ||
215 | } | ||
216 | |||
217 | static inline pte_t pte_mkdirty(pte_t pte) | ||
218 | { | ||
219 | pte_set_bits(pte, _PAGE_DIRTY); | ||
220 | return(pte); | ||
221 | } | ||
222 | |||
223 | static inline pte_t pte_mkyoung(pte_t pte) | ||
224 | { | ||
225 | pte_set_bits(pte, _PAGE_ACCESSED); | ||
226 | return(pte); | ||
227 | } | ||
228 | |||
229 | static inline pte_t pte_mkwrite(pte_t pte) | ||
230 | { | ||
231 | pte_set_bits(pte, _PAGE_RW); | ||
232 | return(pte_mknewprot(pte)); | ||
233 | } | ||
234 | |||
235 | static inline pte_t pte_mkuptodate(pte_t pte) | ||
236 | { | ||
237 | pte_clear_bits(pte, _PAGE_NEWPAGE); | ||
238 | if(pte_present(pte)) | ||
239 | pte_clear_bits(pte, _PAGE_NEWPROT); | ||
240 | return(pte); | ||
241 | } | ||
242 | |||
243 | static inline pte_t pte_mknewpage(pte_t pte) | ||
244 | { | ||
245 | pte_set_bits(pte, _PAGE_NEWPAGE); | ||
246 | return(pte); | ||
247 | } | ||
248 | |||
249 | static inline pte_t pte_mkspecial(pte_t pte) | ||
250 | { | ||
251 | return(pte); | ||
252 | } | ||
253 | |||
254 | static inline void set_pte(pte_t *pteptr, pte_t pteval) | ||
255 | { | ||
256 | pte_copy(*pteptr, pteval); | ||
257 | |||
258 | /* If it's a swap entry, it needs to be marked _PAGE_NEWPAGE so | ||
259 | * fix_range knows to unmap it. _PAGE_NEWPROT is specific to | ||
260 | * mapped pages. | ||
261 | */ | ||
262 | |||
263 | *pteptr = pte_mknewpage(*pteptr); | ||
264 | if(pte_present(*pteptr)) *pteptr = pte_mknewprot(*pteptr); | ||
265 | } | ||
266 | #define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval) | ||
267 | |||
268 | /* | ||
269 | * Conversion functions: convert a page and protection to a page entry, | ||
270 | * and a page entry and page directory to the page they refer to. | ||
271 | */ | ||
272 | |||
273 | #define phys_to_page(phys) pfn_to_page(phys_to_pfn(phys)) | ||
274 | #define __virt_to_page(virt) phys_to_page(__pa(virt)) | ||
275 | #define page_to_phys(page) pfn_to_phys((pfn_t) page_to_pfn(page)) | ||
276 | #define virt_to_page(addr) __virt_to_page((const unsigned long) addr) | ||
277 | |||
278 | #define mk_pte(page, pgprot) \ | ||
279 | ({ pte_t pte; \ | ||
280 | \ | ||
281 | pte_set_val(pte, page_to_phys(page), (pgprot)); \ | ||
282 | if (pte_present(pte)) \ | ||
283 | pte_mknewprot(pte_mknewpage(pte)); \ | ||
284 | pte;}) | ||
285 | |||
286 | static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) | ||
287 | { | ||
288 | pte_set_val(pte, (pte_val(pte) & _PAGE_CHG_MASK), newprot); | ||
289 | return pte; | ||
290 | } | ||
291 | |||
292 | /* | ||
293 | * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD] | ||
294 | * | ||
295 | * this macro returns the index of the entry in the pgd page which would | ||
296 | * control the given virtual address | ||
297 | */ | ||
298 | #define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) | ||
299 | |||
300 | /* | ||
301 | * pgd_offset() returns a (pgd_t *) | ||
302 | * pgd_index() is used get the offset into the pgd page's array of pgd_t's; | ||
303 | */ | ||
304 | #define pgd_offset(mm, address) ((mm)->pgd+pgd_index(address)) | ||
305 | |||
306 | /* | ||
307 | * a shortcut which implies the use of the kernel's pgd, instead | ||
308 | * of a process's | ||
309 | */ | ||
310 | #define pgd_offset_k(address) pgd_offset(&init_mm, address) | ||
311 | |||
312 | /* | ||
313 | * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD] | ||
314 | * | ||
315 | * this macro returns the index of the entry in the pmd page which would | ||
316 | * control the given virtual address | ||
317 | */ | ||
318 | #define pmd_page_vaddr(pmd) ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK)) | ||
319 | #define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) | ||
320 | |||
321 | #define pmd_page_vaddr(pmd) \ | ||
322 | ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK)) | ||
323 | |||
324 | /* | ||
325 | * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE] | ||
326 | * | ||
327 | * this macro returns the index of the entry in the pte page which would | ||
328 | * control the given virtual address | ||
329 | */ | ||
330 | #define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) | ||
331 | #define pte_offset_kernel(dir, address) \ | ||
332 | ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(address)) | ||
333 | #define pte_offset_map(dir, address) \ | ||
334 | ((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address)) | ||
335 | #define pte_offset_map_nested(dir, address) pte_offset_map(dir, address) | ||
336 | #define pte_unmap(pte) do { } while (0) | ||
337 | #define pte_unmap_nested(pte) do { } while (0) | ||
338 | |||
339 | struct mm_struct; | ||
340 | extern pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr); | ||
341 | |||
342 | #define update_mmu_cache(vma,address,pte) do ; while (0) | ||
343 | |||
344 | /* Encode and de-code a swap entry */ | ||
345 | #define __swp_type(x) (((x).val >> 4) & 0x3f) | ||
346 | #define __swp_offset(x) ((x).val >> 11) | ||
347 | |||
348 | #define __swp_entry(type, offset) \ | ||
349 | ((swp_entry_t) { ((type) << 4) | ((offset) << 11) }) | ||
350 | #define __pte_to_swp_entry(pte) \ | ||
351 | ((swp_entry_t) { pte_val(pte_mkuptodate(pte)) }) | ||
352 | #define __swp_entry_to_pte(x) ((pte_t) { (x).val }) | ||
353 | |||
354 | #define kern_addr_valid(addr) (1) | ||
355 | |||
356 | #include <asm-generic/pgtable.h> | ||
357 | |||
358 | #endif | ||
diff --git a/include/asm-um/poll.h b/include/asm-um/poll.h deleted file mode 100644 index 1eb4e1bc6383..000000000000 --- a/include/asm-um/poll.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_POLL_H | ||
2 | #define __UM_POLL_H | ||
3 | |||
4 | #include "asm/arch/poll.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/posix_types.h b/include/asm-um/posix_types.h deleted file mode 100644 index 32fb4198f644..000000000000 --- a/include/asm-um/posix_types.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_POSIX_TYPES_H | ||
2 | #define __UM_POSIX_TYPES_H | ||
3 | |||
4 | #include "asm/arch/posix_types.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/prctl.h b/include/asm-um/prctl.h deleted file mode 100644 index 64b6d099bdd5..000000000000 --- a/include/asm-um/prctl.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_PRCTL_H | ||
2 | #define __UM_PRCTL_H | ||
3 | |||
4 | #include "asm/arch/prctl.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h deleted file mode 100644 index bed668824b5f..000000000000 --- a/include/asm-um/processor-generic.h +++ /dev/null | |||
@@ -1,136 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __UM_PROCESSOR_GENERIC_H | ||
7 | #define __UM_PROCESSOR_GENERIC_H | ||
8 | |||
9 | struct pt_regs; | ||
10 | |||
11 | struct task_struct; | ||
12 | |||
13 | #include "asm/ptrace.h" | ||
14 | #include "registers.h" | ||
15 | #include "sysdep/archsetjmp.h" | ||
16 | |||
17 | struct mm_struct; | ||
18 | |||
19 | struct thread_struct { | ||
20 | struct task_struct *saved_task; | ||
21 | /* | ||
22 | * This flag is set to 1 before calling do_fork (and analyzed in | ||
23 | * copy_thread) to mark that we are begin called from userspace (fork / | ||
24 | * vfork / clone), and reset to 0 after. It is left to 0 when called | ||
25 | * from kernelspace (i.e. kernel_thread() or fork_idle(), | ||
26 | * as of 2.6.11). | ||
27 | */ | ||
28 | int forking; | ||
29 | struct pt_regs regs; | ||
30 | int singlestep_syscall; | ||
31 | void *fault_addr; | ||
32 | jmp_buf *fault_catcher; | ||
33 | struct task_struct *prev_sched; | ||
34 | unsigned long temp_stack; | ||
35 | jmp_buf *exec_buf; | ||
36 | struct arch_thread arch; | ||
37 | jmp_buf switch_buf; | ||
38 | int mm_count; | ||
39 | struct { | ||
40 | int op; | ||
41 | union { | ||
42 | struct { | ||
43 | int pid; | ||
44 | } fork, exec; | ||
45 | struct { | ||
46 | int (*proc)(void *); | ||
47 | void *arg; | ||
48 | } thread; | ||
49 | struct { | ||
50 | void (*proc)(void *); | ||
51 | void *arg; | ||
52 | } cb; | ||
53 | } u; | ||
54 | } request; | ||
55 | }; | ||
56 | |||
57 | #define INIT_THREAD \ | ||
58 | { \ | ||
59 | .forking = 0, \ | ||
60 | .regs = EMPTY_REGS, \ | ||
61 | .fault_addr = NULL, \ | ||
62 | .prev_sched = NULL, \ | ||
63 | .temp_stack = 0, \ | ||
64 | .exec_buf = NULL, \ | ||
65 | .arch = INIT_ARCH_THREAD, \ | ||
66 | .request = { 0 } \ | ||
67 | } | ||
68 | |||
69 | extern struct task_struct *alloc_task_struct(void); | ||
70 | |||
71 | static inline void release_thread(struct task_struct *task) | ||
72 | { | ||
73 | } | ||
74 | |||
75 | extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags); | ||
76 | |||
77 | static inline void prepare_to_copy(struct task_struct *tsk) | ||
78 | { | ||
79 | } | ||
80 | |||
81 | |||
82 | extern unsigned long thread_saved_pc(struct task_struct *t); | ||
83 | |||
84 | static inline void mm_copy_segments(struct mm_struct *from_mm, | ||
85 | struct mm_struct *new_mm) | ||
86 | { | ||
87 | } | ||
88 | |||
89 | #define init_stack (init_thread_union.stack) | ||
90 | |||
91 | /* | ||
92 | * User space process size: 3GB (default). | ||
93 | */ | ||
94 | extern unsigned long task_size; | ||
95 | |||
96 | #define TASK_SIZE (task_size) | ||
97 | |||
98 | #undef STACK_TOP | ||
99 | #undef STACK_TOP_MAX | ||
100 | |||
101 | extern unsigned long stacksizelim; | ||
102 | |||
103 | #define STACK_ROOM (stacksizelim) | ||
104 | #define STACK_TOP (TASK_SIZE - 2 * PAGE_SIZE) | ||
105 | #define STACK_TOP_MAX STACK_TOP | ||
106 | |||
107 | /* This decides where the kernel will search for a free chunk of vm | ||
108 | * space during mmap's. | ||
109 | */ | ||
110 | #define TASK_UNMAPPED_BASE (0x40000000) | ||
111 | |||
112 | extern void start_thread(struct pt_regs *regs, unsigned long entry, | ||
113 | unsigned long stack); | ||
114 | |||
115 | struct cpuinfo_um { | ||
116 | unsigned long loops_per_jiffy; | ||
117 | int ipi_pipe[2]; | ||
118 | }; | ||
119 | |||
120 | extern struct cpuinfo_um boot_cpu_data; | ||
121 | |||
122 | #define my_cpu_data cpu_data[smp_processor_id()] | ||
123 | |||
124 | #ifdef CONFIG_SMP | ||
125 | extern struct cpuinfo_um cpu_data[]; | ||
126 | #define current_cpu_data cpu_data[smp_processor_id()] | ||
127 | #else | ||
128 | #define cpu_data (&boot_cpu_data) | ||
129 | #define current_cpu_data boot_cpu_data | ||
130 | #endif | ||
131 | |||
132 | |||
133 | #define KSTK_REG(tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf) | ||
134 | extern unsigned long get_wchan(struct task_struct *p); | ||
135 | |||
136 | #endif | ||
diff --git a/include/asm-um/processor-i386.h b/include/asm-um/processor-i386.h deleted file mode 100644 index a2b7fe13fe1e..000000000000 --- a/include/asm-um/processor-i386.h +++ /dev/null | |||
@@ -1,78 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __UM_PROCESSOR_I386_H | ||
7 | #define __UM_PROCESSOR_I386_H | ||
8 | |||
9 | #include "linux/string.h" | ||
10 | #include "asm/host_ldt.h" | ||
11 | #include "asm/segment.h" | ||
12 | |||
13 | extern int host_has_cmov; | ||
14 | |||
15 | /* include faultinfo structure */ | ||
16 | #include "sysdep/faultinfo.h" | ||
17 | |||
18 | struct uml_tls_struct { | ||
19 | struct user_desc tls; | ||
20 | unsigned flushed:1; | ||
21 | unsigned present:1; | ||
22 | }; | ||
23 | |||
24 | struct arch_thread { | ||
25 | struct uml_tls_struct tls_array[GDT_ENTRY_TLS_ENTRIES]; | ||
26 | unsigned long debugregs[8]; | ||
27 | int debugregs_seq; | ||
28 | struct faultinfo faultinfo; | ||
29 | }; | ||
30 | |||
31 | #define INIT_ARCH_THREAD { \ | ||
32 | .tls_array = { [ 0 ... GDT_ENTRY_TLS_ENTRIES - 1 ] = \ | ||
33 | { .present = 0, .flushed = 0 } }, \ | ||
34 | .debugregs = { [ 0 ... 7 ] = 0 }, \ | ||
35 | .debugregs_seq = 0, \ | ||
36 | .faultinfo = { 0, 0, 0 } \ | ||
37 | } | ||
38 | |||
39 | static inline void arch_flush_thread(struct arch_thread *thread) | ||
40 | { | ||
41 | /* Clear any TLS still hanging */ | ||
42 | memset(&thread->tls_array, 0, sizeof(thread->tls_array)); | ||
43 | } | ||
44 | |||
45 | static inline void arch_copy_thread(struct arch_thread *from, | ||
46 | struct arch_thread *to) | ||
47 | { | ||
48 | memcpy(&to->tls_array, &from->tls_array, sizeof(from->tls_array)); | ||
49 | } | ||
50 | |||
51 | #include "asm/arch/user.h" | ||
52 | |||
53 | /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ | ||
54 | static inline void rep_nop(void) | ||
55 | { | ||
56 | __asm__ __volatile__("rep;nop": : :"memory"); | ||
57 | } | ||
58 | |||
59 | #define cpu_relax() rep_nop() | ||
60 | |||
61 | /* | ||
62 | * Default implementation of macro that returns current | ||
63 | * instruction pointer ("program counter"). Stolen | ||
64 | * from asm-i386/processor.h | ||
65 | */ | ||
66 | #define current_text_addr() \ | ||
67 | ({ void *pc; __asm__("movl $1f,%0\n1:":"=g" (pc)); pc; }) | ||
68 | |||
69 | #define ARCH_IS_STACKGROW(address) \ | ||
70 | (address + 32 >= UPT_SP(¤t->thread.regs.regs)) | ||
71 | |||
72 | #define KSTK_EIP(tsk) KSTK_REG(tsk, EIP) | ||
73 | #define KSTK_ESP(tsk) KSTK_REG(tsk, UESP) | ||
74 | #define KSTK_EBP(tsk) KSTK_REG(tsk, EBP) | ||
75 | |||
76 | #include "asm/processor-generic.h" | ||
77 | |||
78 | #endif | ||
diff --git a/include/asm-um/processor-ppc.h b/include/asm-um/processor-ppc.h deleted file mode 100644 index 959323151229..000000000000 --- a/include/asm-um/processor-ppc.h +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | #ifndef __UM_PROCESSOR_PPC_H | ||
2 | #define __UM_PROCESSOR_PPC_H | ||
3 | |||
4 | #if defined(__ASSEMBLY__) | ||
5 | |||
6 | #define CONFIG_PPC_MULTIPLATFORM | ||
7 | #include "arch/processor.h" | ||
8 | |||
9 | #else | ||
10 | |||
11 | #include "asm/processor-generic.h" | ||
12 | |||
13 | #endif | ||
14 | |||
15 | #endif | ||
diff --git a/include/asm-um/processor-x86_64.h b/include/asm-um/processor-x86_64.h deleted file mode 100644 index e50933175e91..000000000000 --- a/include/asm-um/processor-x86_64.h +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright 2003 PathScale, Inc. | ||
3 | * | ||
4 | * Licensed under the GPL | ||
5 | */ | ||
6 | |||
7 | #ifndef __UM_PROCESSOR_X86_64_H | ||
8 | #define __UM_PROCESSOR_X86_64_H | ||
9 | |||
10 | /* include faultinfo structure */ | ||
11 | #include "sysdep/faultinfo.h" | ||
12 | |||
13 | struct arch_thread { | ||
14 | unsigned long debugregs[8]; | ||
15 | int debugregs_seq; | ||
16 | unsigned long fs; | ||
17 | struct faultinfo faultinfo; | ||
18 | }; | ||
19 | |||
20 | /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ | ||
21 | static inline void rep_nop(void) | ||
22 | { | ||
23 | __asm__ __volatile__("rep;nop": : :"memory"); | ||
24 | } | ||
25 | |||
26 | #define cpu_relax() rep_nop() | ||
27 | |||
28 | #define INIT_ARCH_THREAD { .debugregs = { [ 0 ... 7 ] = 0 }, \ | ||
29 | .debugregs_seq = 0, \ | ||
30 | .fs = 0, \ | ||
31 | .faultinfo = { 0, 0, 0 } } | ||
32 | |||
33 | static inline void arch_flush_thread(struct arch_thread *thread) | ||
34 | { | ||
35 | } | ||
36 | |||
37 | static inline void arch_copy_thread(struct arch_thread *from, | ||
38 | struct arch_thread *to) | ||
39 | { | ||
40 | to->fs = from->fs; | ||
41 | } | ||
42 | |||
43 | #include "asm/arch/user.h" | ||
44 | |||
45 | #define current_text_addr() \ | ||
46 | ({ void *pc; __asm__("movq $1f,%0\n1:":"=g" (pc)); pc; }) | ||
47 | |||
48 | #define ARCH_IS_STACKGROW(address) \ | ||
49 | (address + 128 >= UPT_SP(¤t->thread.regs.regs)) | ||
50 | |||
51 | #define KSTK_EIP(tsk) KSTK_REG(tsk, RIP) | ||
52 | #define KSTK_ESP(tsk) KSTK_REG(tsk, RSP) | ||
53 | |||
54 | #include "asm/processor-generic.h" | ||
55 | |||
56 | #endif | ||
diff --git a/include/asm-um/ptrace-generic.h b/include/asm-um/ptrace-generic.h deleted file mode 100644 index 315749705ea1..000000000000 --- a/include/asm-um/ptrace-generic.h +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __UM_PTRACE_GENERIC_H | ||
7 | #define __UM_PTRACE_GENERIC_H | ||
8 | |||
9 | #ifndef __ASSEMBLY__ | ||
10 | |||
11 | #include "asm/arch/ptrace-abi.h" | ||
12 | #include <asm/user.h> | ||
13 | #include "sysdep/ptrace.h" | ||
14 | |||
15 | struct pt_regs { | ||
16 | struct uml_pt_regs regs; | ||
17 | }; | ||
18 | |||
19 | #define EMPTY_REGS { .regs = EMPTY_UML_PT_REGS } | ||
20 | |||
21 | #define PT_REGS_IP(r) UPT_IP(&(r)->regs) | ||
22 | #define PT_REGS_SP(r) UPT_SP(&(r)->regs) | ||
23 | |||
24 | #define PT_REG(r, reg) UPT_REG(&(r)->regs, reg) | ||
25 | #define PT_REGS_SET(r, reg, val) UPT_SET(&(r)->regs, reg, val) | ||
26 | |||
27 | #define PT_REGS_SET_SYSCALL_RETURN(r, res) \ | ||
28 | UPT_SET_SYSCALL_RETURN(&(r)->regs, res) | ||
29 | #define PT_REGS_RESTART_SYSCALL(r) UPT_RESTART_SYSCALL(&(r)->regs) | ||
30 | |||
31 | #define PT_REGS_SYSCALL_NR(r) UPT_SYSCALL_NR(&(r)->regs) | ||
32 | |||
33 | #define PT_REGS_SC(r) UPT_SC(&(r)->regs) | ||
34 | |||
35 | #define instruction_pointer(regs) PT_REGS_IP(regs) | ||
36 | |||
37 | struct task_struct; | ||
38 | |||
39 | extern long subarch_ptrace(struct task_struct *child, long request, long addr, | ||
40 | long data); | ||
41 | extern unsigned long getreg(struct task_struct *child, int regno); | ||
42 | extern int putreg(struct task_struct *child, int regno, unsigned long value); | ||
43 | extern int get_fpregs(struct user_i387_struct __user *buf, | ||
44 | struct task_struct *child); | ||
45 | extern int set_fpregs(struct user_i387_struct __user *buf, | ||
46 | struct task_struct *child); | ||
47 | |||
48 | extern void show_regs(struct pt_regs *regs); | ||
49 | |||
50 | extern int arch_copy_tls(struct task_struct *new); | ||
51 | extern void clear_flushed_tls(struct task_struct *task); | ||
52 | |||
53 | #endif | ||
54 | |||
55 | #endif | ||
diff --git a/include/asm-um/ptrace-i386.h b/include/asm-um/ptrace-i386.h deleted file mode 100644 index b2d24c5ea2c3..000000000000 --- a/include/asm-um/ptrace-i386.h +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __UM_PTRACE_I386_H | ||
7 | #define __UM_PTRACE_I386_H | ||
8 | |||
9 | #define HOST_AUDIT_ARCH AUDIT_ARCH_I386 | ||
10 | |||
11 | #include "linux/compiler.h" | ||
12 | #include "asm/ptrace-generic.h" | ||
13 | #include <asm/user.h> | ||
14 | #include "sysdep/ptrace.h" | ||
15 | |||
16 | #define PT_REGS_EAX(r) UPT_EAX(&(r)->regs) | ||
17 | #define PT_REGS_EBX(r) UPT_EBX(&(r)->regs) | ||
18 | #define PT_REGS_ECX(r) UPT_ECX(&(r)->regs) | ||
19 | #define PT_REGS_EDX(r) UPT_EDX(&(r)->regs) | ||
20 | #define PT_REGS_ESI(r) UPT_ESI(&(r)->regs) | ||
21 | #define PT_REGS_EDI(r) UPT_EDI(&(r)->regs) | ||
22 | #define PT_REGS_EBP(r) UPT_EBP(&(r)->regs) | ||
23 | |||
24 | #define PT_REGS_CS(r) UPT_CS(&(r)->regs) | ||
25 | #define PT_REGS_SS(r) UPT_SS(&(r)->regs) | ||
26 | #define PT_REGS_DS(r) UPT_DS(&(r)->regs) | ||
27 | #define PT_REGS_ES(r) UPT_ES(&(r)->regs) | ||
28 | #define PT_REGS_FS(r) UPT_FS(&(r)->regs) | ||
29 | #define PT_REGS_GS(r) UPT_GS(&(r)->regs) | ||
30 | |||
31 | #define PT_REGS_EFLAGS(r) UPT_EFLAGS(&(r)->regs) | ||
32 | |||
33 | #define PT_REGS_ORIG_SYSCALL(r) PT_REGS_EAX(r) | ||
34 | #define PT_REGS_SYSCALL_RET(r) PT_REGS_EAX(r) | ||
35 | #define PT_FIX_EXEC_STACK(sp) do ; while(0) | ||
36 | |||
37 | /* Cope with a conditional i386 definition. */ | ||
38 | #undef profile_pc | ||
39 | #define profile_pc(regs) PT_REGS_IP(regs) | ||
40 | |||
41 | #define user_mode(r) UPT_IS_USER(&(r)->regs) | ||
42 | |||
43 | /* | ||
44 | * Forward declaration to avoid including sysdep/tls.h, which causes a | ||
45 | * circular include, and compilation failures. | ||
46 | */ | ||
47 | struct user_desc; | ||
48 | |||
49 | extern int get_fpxregs(struct user_fxsr_struct __user *buf, | ||
50 | struct task_struct *child); | ||
51 | extern int set_fpxregs(struct user_fxsr_struct __user *buf, | ||
52 | struct task_struct *tsk); | ||
53 | |||
54 | extern int ptrace_get_thread_area(struct task_struct *child, int idx, | ||
55 | struct user_desc __user *user_desc); | ||
56 | |||
57 | extern int ptrace_set_thread_area(struct task_struct *child, int idx, | ||
58 | struct user_desc __user *user_desc); | ||
59 | |||
60 | #endif | ||
diff --git a/include/asm-um/ptrace-x86_64.h b/include/asm-um/ptrace-x86_64.h deleted file mode 100644 index 4c475350dcf0..000000000000 --- a/include/asm-um/ptrace-x86_64.h +++ /dev/null | |||
@@ -1,81 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright 2003 PathScale, Inc. | ||
3 | * | ||
4 | * Licensed under the GPL | ||
5 | */ | ||
6 | |||
7 | #ifndef __UM_PTRACE_X86_64_H | ||
8 | #define __UM_PTRACE_X86_64_H | ||
9 | |||
10 | #include "linux/compiler.h" | ||
11 | #include "asm/errno.h" | ||
12 | #include "asm/host_ldt.h" | ||
13 | |||
14 | #define __FRAME_OFFSETS /* Needed to get the R* macros */ | ||
15 | #include "asm/ptrace-generic.h" | ||
16 | |||
17 | #define HOST_AUDIT_ARCH AUDIT_ARCH_X86_64 | ||
18 | |||
19 | /* Also defined in sysdep/ptrace.h, so may already be defined. */ | ||
20 | #ifndef FS_BASE | ||
21 | #define FS_BASE (21 * sizeof(unsigned long)) | ||
22 | #define GS_BASE (22 * sizeof(unsigned long)) | ||
23 | #define DS (23 * sizeof(unsigned long)) | ||
24 | #define ES (24 * sizeof(unsigned long)) | ||
25 | #define FS (25 * sizeof(unsigned long)) | ||
26 | #define GS (26 * sizeof(unsigned long)) | ||
27 | #endif | ||
28 | |||
29 | #define PT_REGS_RBX(r) UPT_RBX(&(r)->regs) | ||
30 | #define PT_REGS_RCX(r) UPT_RCX(&(r)->regs) | ||
31 | #define PT_REGS_RDX(r) UPT_RDX(&(r)->regs) | ||
32 | #define PT_REGS_RSI(r) UPT_RSI(&(r)->regs) | ||
33 | #define PT_REGS_RDI(r) UPT_RDI(&(r)->regs) | ||
34 | #define PT_REGS_RBP(r) UPT_RBP(&(r)->regs) | ||
35 | #define PT_REGS_RAX(r) UPT_RAX(&(r)->regs) | ||
36 | #define PT_REGS_R8(r) UPT_R8(&(r)->regs) | ||
37 | #define PT_REGS_R9(r) UPT_R9(&(r)->regs) | ||
38 | #define PT_REGS_R10(r) UPT_R10(&(r)->regs) | ||
39 | #define PT_REGS_R11(r) UPT_R11(&(r)->regs) | ||
40 | #define PT_REGS_R12(r) UPT_R12(&(r)->regs) | ||
41 | #define PT_REGS_R13(r) UPT_R13(&(r)->regs) | ||
42 | #define PT_REGS_R14(r) UPT_R14(&(r)->regs) | ||
43 | #define PT_REGS_R15(r) UPT_R15(&(r)->regs) | ||
44 | |||
45 | #define PT_REGS_FS(r) UPT_FS(&(r)->regs) | ||
46 | #define PT_REGS_GS(r) UPT_GS(&(r)->regs) | ||
47 | #define PT_REGS_DS(r) UPT_DS(&(r)->regs) | ||
48 | #define PT_REGS_ES(r) UPT_ES(&(r)->regs) | ||
49 | #define PT_REGS_SS(r) UPT_SS(&(r)->regs) | ||
50 | #define PT_REGS_CS(r) UPT_CS(&(r)->regs) | ||
51 | |||
52 | #define PT_REGS_ORIG_RAX(r) UPT_ORIG_RAX(&(r)->regs) | ||
53 | #define PT_REGS_RIP(r) UPT_IP(&(r)->regs) | ||
54 | #define PT_REGS_RSP(r) UPT_SP(&(r)->regs) | ||
55 | |||
56 | #define PT_REGS_EFLAGS(r) UPT_EFLAGS(&(r)->regs) | ||
57 | |||
58 | /* XXX */ | ||
59 | #define user_mode(r) UPT_IS_USER(&(r)->regs) | ||
60 | #define PT_REGS_ORIG_SYSCALL(r) PT_REGS_RAX(r) | ||
61 | #define PT_REGS_SYSCALL_RET(r) PT_REGS_RAX(r) | ||
62 | |||
63 | #define PT_FIX_EXEC_STACK(sp) do ; while(0) | ||
64 | |||
65 | #define profile_pc(regs) PT_REGS_IP(regs) | ||
66 | |||
67 | static inline int ptrace_get_thread_area(struct task_struct *child, int idx, | ||
68 | struct user_desc __user *user_desc) | ||
69 | { | ||
70 | return -ENOSYS; | ||
71 | } | ||
72 | |||
73 | static inline int ptrace_set_thread_area(struct task_struct *child, int idx, | ||
74 | struct user_desc __user *user_desc) | ||
75 | { | ||
76 | return -ENOSYS; | ||
77 | } | ||
78 | |||
79 | extern long arch_prctl(struct task_struct *task, int code, | ||
80 | unsigned long __user *addr); | ||
81 | #endif | ||
diff --git a/include/asm-um/required-features.h b/include/asm-um/required-features.h deleted file mode 100644 index dfb967b2d2f3..000000000000 --- a/include/asm-um/required-features.h +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | #ifndef __UM_REQUIRED_FEATURES_H | ||
2 | #define __UM_REQUIRED_FEATURES_H | ||
3 | |||
4 | /* | ||
5 | * Nothing to see, just need something for the i386 and x86_64 asm | ||
6 | * headers to include. | ||
7 | */ | ||
8 | |||
9 | #endif | ||
diff --git a/include/asm-um/resource.h b/include/asm-um/resource.h deleted file mode 100644 index c9b074001252..000000000000 --- a/include/asm-um/resource.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_RESOURCE_H | ||
2 | #define __UM_RESOURCE_H | ||
3 | |||
4 | #include "asm/arch/resource.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/rwlock.h b/include/asm-um/rwlock.h deleted file mode 100644 index ff383aafc9fe..000000000000 --- a/include/asm-um/rwlock.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_RWLOCK_H | ||
2 | #define __UM_RWLOCK_H | ||
3 | |||
4 | #include "asm/arch/rwlock.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/rwsem.h b/include/asm-um/rwsem.h deleted file mode 100644 index b5fc449dc86b..000000000000 --- a/include/asm-um/rwsem.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_RWSEM_H__ | ||
2 | #define __UM_RWSEM_H__ | ||
3 | |||
4 | #include "asm/arch/rwsem.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/scatterlist.h b/include/asm-um/scatterlist.h deleted file mode 100644 index e92016aa2079..000000000000 --- a/include/asm-um/scatterlist.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_SCATTERLIST_H | ||
2 | #define __UM_SCATTERLIST_H | ||
3 | |||
4 | #include "asm/arch/scatterlist.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/sections.h b/include/asm-um/sections.h deleted file mode 100644 index 6b0231eefea8..000000000000 --- a/include/asm-um/sections.h +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | #ifndef _UM_SECTIONS_H | ||
2 | #define _UM_SECTIONS_H | ||
3 | |||
4 | /* nothing to see, move along */ | ||
5 | #include <asm-generic/sections.h> | ||
6 | |||
7 | #endif | ||
diff --git a/include/asm-um/segment.h b/include/asm-um/segment.h deleted file mode 100644 index 45183fcd10b6..000000000000 --- a/include/asm-um/segment.h +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | #ifndef __UM_SEGMENT_H | ||
2 | #define __UM_SEGMENT_H | ||
3 | |||
4 | extern int host_gdt_entry_tls_min; | ||
5 | |||
6 | #define GDT_ENTRY_TLS_ENTRIES 3 | ||
7 | #define GDT_ENTRY_TLS_MIN host_gdt_entry_tls_min | ||
8 | #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1) | ||
9 | |||
10 | #endif | ||
diff --git a/include/asm-um/sembuf.h b/include/asm-um/sembuf.h deleted file mode 100644 index 1ae82c14ff86..000000000000 --- a/include/asm-um/sembuf.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_SEMBUF_H | ||
2 | #define __UM_SEMBUF_H | ||
3 | |||
4 | #include "asm/arch/sembuf.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/serial.h b/include/asm-um/serial.h deleted file mode 100644 index 61ad07cfd2d5..000000000000 --- a/include/asm-um/serial.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_SERIAL_H | ||
2 | #define __UM_SERIAL_H | ||
3 | |||
4 | #include "asm/arch/serial.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/setup.h b/include/asm-um/setup.h deleted file mode 100644 index 99f086301f4c..000000000000 --- a/include/asm-um/setup.h +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | #ifndef SETUP_H_INCLUDED | ||
2 | #define SETUP_H_INCLUDED | ||
3 | |||
4 | /* POSIX mandated with _POSIX_ARG_MAX that we can rely on 4096 chars in the | ||
5 | * command line, so this choice is ok. | ||
6 | */ | ||
7 | |||
8 | #define COMMAND_LINE_SIZE 4096 | ||
9 | |||
10 | #endif /* SETUP_H_INCLUDED */ | ||
diff --git a/include/asm-um/shmbuf.h b/include/asm-um/shmbuf.h deleted file mode 100644 index 9684d4a284a6..000000000000 --- a/include/asm-um/shmbuf.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_SHMBUF_H | ||
2 | #define __UM_SHMBUF_H | ||
3 | |||
4 | #include "asm/arch/shmbuf.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/shmparam.h b/include/asm-um/shmparam.h deleted file mode 100644 index 124c00174f6a..000000000000 --- a/include/asm-um/shmparam.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_SHMPARAM_H | ||
2 | #define __UM_SHMPARAM_H | ||
3 | |||
4 | #include "asm/arch/shmparam.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/sigcontext-generic.h b/include/asm-um/sigcontext-generic.h deleted file mode 100644 index 164587014c61..000000000000 --- a/include/asm-um/sigcontext-generic.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_SIGCONTEXT_GENERIC_H | ||
2 | #define __UM_SIGCONTEXT_GENERIC_H | ||
3 | |||
4 | #include "asm/arch/sigcontext.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/sigcontext-i386.h b/include/asm-um/sigcontext-i386.h deleted file mode 100644 index b88333f488bb..000000000000 --- a/include/asm-um/sigcontext-i386.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_SIGCONTEXT_I386_H | ||
2 | #define __UM_SIGCONTEXT_I386_H | ||
3 | |||
4 | #include "asm/sigcontext-generic.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/sigcontext-ppc.h b/include/asm-um/sigcontext-ppc.h deleted file mode 100644 index 2467f20eda99..000000000000 --- a/include/asm-um/sigcontext-ppc.h +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | #ifndef __UM_SIGCONTEXT_PPC_H | ||
2 | #define __UM_SIGCONTEXT_PPC_H | ||
3 | |||
4 | #define pt_regs sys_pt_regs | ||
5 | |||
6 | #include "asm/sigcontext-generic.h" | ||
7 | |||
8 | #undef pt_regs | ||
9 | |||
10 | #endif | ||
diff --git a/include/asm-um/sigcontext-x86_64.h b/include/asm-um/sigcontext-x86_64.h deleted file mode 100644 index b600e0b01e48..000000000000 --- a/include/asm-um/sigcontext-x86_64.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | /* Copyright 2003 PathScale, Inc. | ||
2 | * | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __UM_SIGCONTEXT_X86_64_H | ||
7 | #define __UM_SIGCONTEXT_X86_64_H | ||
8 | |||
9 | #include "asm/sigcontext-generic.h" | ||
10 | |||
11 | #endif | ||
12 | |||
13 | /* | ||
14 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
15 | * Emacs will notice this stuff at the end of the file and automatically | ||
16 | * adjust the settings for this buffer only. This must remain at the end | ||
17 | * of the file. | ||
18 | * --------------------------------------------------------------------------- | ||
19 | * Local variables: | ||
20 | * c-file-style: "linux" | ||
21 | * End: | ||
22 | */ | ||
diff --git a/include/asm-um/siginfo.h b/include/asm-um/siginfo.h deleted file mode 100644 index bec6124c36d0..000000000000 --- a/include/asm-um/siginfo.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_SIGINFO_H | ||
2 | #define __UM_SIGINFO_H | ||
3 | |||
4 | #include "asm/arch/siginfo.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/signal.h b/include/asm-um/signal.h deleted file mode 100644 index 52ed92cbce4c..000000000000 --- a/include/asm-um/signal.h +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __UM_SIGNAL_H | ||
7 | #define __UM_SIGNAL_H | ||
8 | |||
9 | /* Need to kill the do_signal() declaration in the i386 signal.h */ | ||
10 | |||
11 | #define do_signal do_signal_renamed | ||
12 | #include "asm/arch/signal.h" | ||
13 | #undef do_signal | ||
14 | #undef ptrace_signal_deliver | ||
15 | |||
16 | #define ptrace_signal_deliver(regs, cookie) do {} while(0) | ||
17 | |||
18 | #endif | ||
19 | |||
20 | /* | ||
21 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
22 | * Emacs will notice this stuff at the end of the file and automatically | ||
23 | * adjust the settings for this buffer only. This must remain at the end | ||
24 | * of the file. | ||
25 | * --------------------------------------------------------------------------- | ||
26 | * Local variables: | ||
27 | * c-file-style: "linux" | ||
28 | * End: | ||
29 | */ | ||
diff --git a/include/asm-um/smp.h b/include/asm-um/smp.h deleted file mode 100644 index f27a96313174..000000000000 --- a/include/asm-um/smp.h +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | #ifndef __UM_SMP_H | ||
2 | #define __UM_SMP_H | ||
3 | |||
4 | #ifdef CONFIG_SMP | ||
5 | |||
6 | #include "linux/bitops.h" | ||
7 | #include "asm/current.h" | ||
8 | #include "linux/cpumask.h" | ||
9 | |||
10 | #define raw_smp_processor_id() (current_thread->cpu) | ||
11 | |||
12 | #define cpu_logical_map(n) (n) | ||
13 | #define cpu_number_map(n) (n) | ||
14 | #define PROC_CHANGE_PENALTY 15 /* Pick a number, any number */ | ||
15 | extern int hard_smp_processor_id(void); | ||
16 | #define NO_PROC_ID -1 | ||
17 | |||
18 | extern int ncpus; | ||
19 | |||
20 | |||
21 | static inline void smp_cpus_done(unsigned int maxcpus) | ||
22 | { | ||
23 | } | ||
24 | |||
25 | extern struct task_struct *idle_threads[NR_CPUS]; | ||
26 | |||
27 | #else | ||
28 | |||
29 | #define hard_smp_processor_id() 0 | ||
30 | |||
31 | #endif | ||
32 | |||
33 | #endif | ||
diff --git a/include/asm-um/socket.h b/include/asm-um/socket.h deleted file mode 100644 index 67886e42ef04..000000000000 --- a/include/asm-um/socket.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_SOCKET_H | ||
2 | #define __UM_SOCKET_H | ||
3 | |||
4 | #include "asm/arch/socket.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/sockios.h b/include/asm-um/sockios.h deleted file mode 100644 index 93ee1c55c4d6..000000000000 --- a/include/asm-um/sockios.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_SOCKIOS_H | ||
2 | #define __UM_SOCKIOS_H | ||
3 | |||
4 | #include "asm/arch/sockios.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/spinlock.h b/include/asm-um/spinlock.h deleted file mode 100644 index f18c82886992..000000000000 --- a/include/asm-um/spinlock.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_SPINLOCK_H | ||
2 | #define __UM_SPINLOCK_H | ||
3 | |||
4 | #include "asm/arch/spinlock.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/spinlock_types.h b/include/asm-um/spinlock_types.h deleted file mode 100644 index e5a94294bf82..000000000000 --- a/include/asm-um/spinlock_types.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_SPINLOCK_TYPES_H | ||
2 | #define __UM_SPINLOCK_TYPES_H | ||
3 | |||
4 | #include "asm/arch/spinlock_types.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/stat.h b/include/asm-um/stat.h deleted file mode 100644 index 83ed85ad2539..000000000000 --- a/include/asm-um/stat.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_STAT_H | ||
2 | #define __UM_STAT_H | ||
3 | |||
4 | #include "asm/arch/stat.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/statfs.h b/include/asm-um/statfs.h deleted file mode 100644 index ba6fb53e7f87..000000000000 --- a/include/asm-um/statfs.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _UM_STATFS_H | ||
2 | #define _UM_STATFS_H | ||
3 | |||
4 | #include "asm/arch/statfs.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/string.h b/include/asm-um/string.h deleted file mode 100644 index 9a0571f6dd61..000000000000 --- a/include/asm-um/string.h +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | #ifndef __UM_STRING_H | ||
2 | #define __UM_STRING_H | ||
3 | |||
4 | #include "asm/arch/string.h" | ||
5 | #include "asm/archparam.h" | ||
6 | |||
7 | #endif | ||
diff --git a/include/asm-um/suspend.h b/include/asm-um/suspend.h deleted file mode 100644 index f4e8e007f468..000000000000 --- a/include/asm-um/suspend.h +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | #ifndef __UM_SUSPEND_H | ||
2 | #define __UM_SUSPEND_H | ||
3 | |||
4 | #endif | ||
diff --git a/include/asm-um/system-generic.h b/include/asm-um/system-generic.h deleted file mode 100644 index 5bcfa35e7a22..000000000000 --- a/include/asm-um/system-generic.h +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | #ifndef __UM_SYSTEM_GENERIC_H | ||
2 | #define __UM_SYSTEM_GENERIC_H | ||
3 | |||
4 | #include "asm/arch/system.h" | ||
5 | |||
6 | #undef switch_to | ||
7 | #undef local_irq_save | ||
8 | #undef local_irq_restore | ||
9 | #undef local_irq_disable | ||
10 | #undef local_irq_enable | ||
11 | #undef local_save_flags | ||
12 | #undef local_irq_restore | ||
13 | #undef local_irq_enable | ||
14 | #undef local_irq_disable | ||
15 | #undef local_irq_save | ||
16 | #undef irqs_disabled | ||
17 | |||
18 | extern void *switch_to(void *prev, void *next, void *last); | ||
19 | |||
20 | extern int get_signals(void); | ||
21 | extern int set_signals(int enable); | ||
22 | extern int get_signals(void); | ||
23 | extern void block_signals(void); | ||
24 | extern void unblock_signals(void); | ||
25 | |||
26 | #define local_save_flags(flags) do { typecheck(unsigned long, flags); \ | ||
27 | (flags) = get_signals(); } while(0) | ||
28 | #define local_irq_restore(flags) do { typecheck(unsigned long, flags); \ | ||
29 | set_signals(flags); } while(0) | ||
30 | |||
31 | #define local_irq_save(flags) do { local_save_flags(flags); \ | ||
32 | local_irq_disable(); } while(0) | ||
33 | |||
34 | #define local_irq_enable() unblock_signals() | ||
35 | #define local_irq_disable() block_signals() | ||
36 | |||
37 | #define irqs_disabled() \ | ||
38 | ({ \ | ||
39 | unsigned long flags; \ | ||
40 | local_save_flags(flags); \ | ||
41 | (flags == 0); \ | ||
42 | }) | ||
43 | |||
44 | extern void *_switch_to(void *prev, void *next, void *last); | ||
45 | #define switch_to(prev, next, last) prev = _switch_to(prev, next, last) | ||
46 | |||
47 | #endif | ||
diff --git a/include/asm-um/system-i386.h b/include/asm-um/system-i386.h deleted file mode 100644 index c436263e67ba..000000000000 --- a/include/asm-um/system-i386.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_SYSTEM_I386_H | ||
2 | #define __UM_SYSTEM_I386_H | ||
3 | |||
4 | #include "asm/system-generic.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/system-ppc.h b/include/asm-um/system-ppc.h deleted file mode 100644 index 17cde6640bf5..000000000000 --- a/include/asm-um/system-ppc.h +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | #ifndef __UM_SYSTEM_PPC_H | ||
2 | #define __UM_SYSTEM_PPC_H | ||
3 | |||
4 | #define _switch_to _ppc_switch_to | ||
5 | |||
6 | #include "asm/arch/system.h" | ||
7 | |||
8 | #undef _switch_to | ||
9 | |||
10 | #include "asm/system-generic.h" | ||
11 | |||
12 | #endif | ||
diff --git a/include/asm-um/system-x86_64.h b/include/asm-um/system-x86_64.h deleted file mode 100644 index e1b61b580734..000000000000 --- a/include/asm-um/system-x86_64.h +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright 2003 PathScale, Inc. | ||
3 | * | ||
4 | * Licensed under the GPL | ||
5 | */ | ||
6 | |||
7 | #ifndef __UM_SYSTEM_X86_64_H | ||
8 | #define __UM_SYSTEM_X86_64_H | ||
9 | |||
10 | #include "asm/system-generic.h" | ||
11 | |||
12 | #endif | ||
13 | |||
14 | /* | ||
15 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
16 | * Emacs will notice this stuff at the end of the file and automatically | ||
17 | * adjust the settings for this buffer only. This must remain at the end | ||
18 | * of the file. | ||
19 | * --------------------------------------------------------------------------- | ||
20 | * Local variables: | ||
21 | * c-file-style: "linux" | ||
22 | * End: | ||
23 | */ | ||
diff --git a/include/asm-um/termbits.h b/include/asm-um/termbits.h deleted file mode 100644 index 5739c608a2cb..000000000000 --- a/include/asm-um/termbits.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_TERMBITS_H | ||
2 | #define __UM_TERMBITS_H | ||
3 | |||
4 | #include "asm/arch/termbits.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/termios.h b/include/asm-um/termios.h deleted file mode 100644 index d9f97b303311..000000000000 --- a/include/asm-um/termios.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_TERMIOS_H | ||
2 | #define __UM_TERMIOS_H | ||
3 | |||
4 | #include "asm/arch/termios.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/thread_info.h b/include/asm-um/thread_info.h deleted file mode 100644 index 62274ab9471f..000000000000 --- a/include/asm-um/thread_info.h +++ /dev/null | |||
@@ -1,83 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __UM_THREAD_INFO_H | ||
7 | #define __UM_THREAD_INFO_H | ||
8 | |||
9 | #ifndef __ASSEMBLY__ | ||
10 | |||
11 | #include <asm/types.h> | ||
12 | #include <asm/page.h> | ||
13 | #include <asm/uaccess.h> | ||
14 | |||
15 | struct thread_info { | ||
16 | struct task_struct *task; /* main task structure */ | ||
17 | struct exec_domain *exec_domain; /* execution domain */ | ||
18 | unsigned long flags; /* low level flags */ | ||
19 | __u32 cpu; /* current CPU */ | ||
20 | int preempt_count; /* 0 => preemptable, | ||
21 | <0 => BUG */ | ||
22 | mm_segment_t addr_limit; /* thread address space: | ||
23 | 0-0xBFFFFFFF for user | ||
24 | 0-0xFFFFFFFF for kernel */ | ||
25 | struct restart_block restart_block; | ||
26 | struct thread_info *real_thread; /* Points to non-IRQ stack */ | ||
27 | }; | ||
28 | |||
29 | #define INIT_THREAD_INFO(tsk) \ | ||
30 | { \ | ||
31 | .task = &tsk, \ | ||
32 | .exec_domain = &default_exec_domain, \ | ||
33 | .flags = 0, \ | ||
34 | .cpu = 0, \ | ||
35 | .preempt_count = 1, \ | ||
36 | .addr_limit = KERNEL_DS, \ | ||
37 | .restart_block = { \ | ||
38 | .fn = do_no_restart_syscall, \ | ||
39 | }, \ | ||
40 | .real_thread = NULL, \ | ||
41 | } | ||
42 | |||
43 | #define init_thread_info (init_thread_union.thread_info) | ||
44 | #define init_stack (init_thread_union.stack) | ||
45 | |||
46 | #define THREAD_SIZE ((1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE) | ||
47 | /* how to get the thread information struct from C */ | ||
48 | static inline struct thread_info *current_thread_info(void) | ||
49 | { | ||
50 | struct thread_info *ti; | ||
51 | unsigned long mask = THREAD_SIZE - 1; | ||
52 | ti = (struct thread_info *) (((unsigned long) &ti) & ~mask); | ||
53 | return ti; | ||
54 | } | ||
55 | |||
56 | #define THREAD_SIZE_ORDER CONFIG_KERNEL_STACK_ORDER | ||
57 | |||
58 | #endif | ||
59 | |||
60 | #define PREEMPT_ACTIVE 0x10000000 | ||
61 | |||
62 | #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ | ||
63 | #define TIF_SIGPENDING 1 /* signal pending */ | ||
64 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ | ||
65 | #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling | ||
66 | * TIF_NEED_RESCHED | ||
67 | */ | ||
68 | #define TIF_RESTART_BLOCK 4 | ||
69 | #define TIF_MEMDIE 5 | ||
70 | #define TIF_SYSCALL_AUDIT 6 | ||
71 | #define TIF_RESTORE_SIGMASK 7 | ||
72 | #define TIF_FREEZE 16 /* is freezing for suspend */ | ||
73 | |||
74 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) | ||
75 | #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) | ||
76 | #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) | ||
77 | #define _TIF_POLLING_NRFLAG (1 << TIF_POLLING_NRFLAG) | ||
78 | #define _TIF_MEMDIE (1 << TIF_MEMDIE) | ||
79 | #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) | ||
80 | #define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK) | ||
81 | #define _TIF_FREEZE (1 << TIF_FREEZE) | ||
82 | |||
83 | #endif | ||
diff --git a/include/asm-um/timex.h b/include/asm-um/timex.h deleted file mode 100644 index 0f4ada08f748..000000000000 --- a/include/asm-um/timex.h +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | #ifndef __UM_TIMEX_H | ||
2 | #define __UM_TIMEX_H | ||
3 | |||
4 | typedef unsigned long cycles_t; | ||
5 | |||
6 | static inline cycles_t get_cycles (void) | ||
7 | { | ||
8 | return 0; | ||
9 | } | ||
10 | |||
11 | #define CLOCK_TICK_RATE (HZ) | ||
12 | |||
13 | #endif | ||
diff --git a/include/asm-um/tlb.h b/include/asm-um/tlb.h deleted file mode 100644 index 5240fa1c5e08..000000000000 --- a/include/asm-um/tlb.h +++ /dev/null | |||
@@ -1,127 +0,0 @@ | |||
1 | #ifndef __UM_TLB_H | ||
2 | #define __UM_TLB_H | ||
3 | |||
4 | #include <linux/pagemap.h> | ||
5 | #include <linux/swap.h> | ||
6 | #include <asm/percpu.h> | ||
7 | #include <asm/pgalloc.h> | ||
8 | #include <asm/tlbflush.h> | ||
9 | |||
10 | #define tlb_start_vma(tlb, vma) do { } while (0) | ||
11 | #define tlb_end_vma(tlb, vma) do { } while (0) | ||
12 | #define tlb_flush(tlb) flush_tlb_mm((tlb)->mm) | ||
13 | |||
14 | /* struct mmu_gather is an opaque type used by the mm code for passing around | ||
15 | * any data needed by arch specific code for tlb_remove_page. | ||
16 | */ | ||
17 | struct mmu_gather { | ||
18 | struct mm_struct *mm; | ||
19 | unsigned int need_flush; /* Really unmapped some ptes? */ | ||
20 | unsigned long start; | ||
21 | unsigned long end; | ||
22 | unsigned int fullmm; /* non-zero means full mm flush */ | ||
23 | }; | ||
24 | |||
25 | /* Users of the generic TLB shootdown code must declare this storage space. */ | ||
26 | DECLARE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
27 | |||
28 | static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, | ||
29 | unsigned long address) | ||
30 | { | ||
31 | if (tlb->start > address) | ||
32 | tlb->start = address; | ||
33 | if (tlb->end < address + PAGE_SIZE) | ||
34 | tlb->end = address + PAGE_SIZE; | ||
35 | } | ||
36 | |||
37 | static inline void init_tlb_gather(struct mmu_gather *tlb) | ||
38 | { | ||
39 | tlb->need_flush = 0; | ||
40 | |||
41 | tlb->start = TASK_SIZE; | ||
42 | tlb->end = 0; | ||
43 | |||
44 | if (tlb->fullmm) { | ||
45 | tlb->start = 0; | ||
46 | tlb->end = TASK_SIZE; | ||
47 | } | ||
48 | } | ||
49 | |||
50 | /* tlb_gather_mmu | ||
51 | * Return a pointer to an initialized struct mmu_gather. | ||
52 | */ | ||
53 | static inline struct mmu_gather * | ||
54 | tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush) | ||
55 | { | ||
56 | struct mmu_gather *tlb = &get_cpu_var(mmu_gathers); | ||
57 | |||
58 | tlb->mm = mm; | ||
59 | tlb->fullmm = full_mm_flush; | ||
60 | |||
61 | init_tlb_gather(tlb); | ||
62 | |||
63 | return tlb; | ||
64 | } | ||
65 | |||
66 | extern void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, | ||
67 | unsigned long end); | ||
68 | |||
69 | static inline void | ||
70 | tlb_flush_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end) | ||
71 | { | ||
72 | if (!tlb->need_flush) | ||
73 | return; | ||
74 | |||
75 | flush_tlb_mm_range(tlb->mm, tlb->start, tlb->end); | ||
76 | init_tlb_gather(tlb); | ||
77 | } | ||
78 | |||
79 | /* tlb_finish_mmu | ||
80 | * Called at the end of the shootdown operation to free up any resources | ||
81 | * that were required. | ||
82 | */ | ||
83 | static inline void | ||
84 | tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end) | ||
85 | { | ||
86 | tlb_flush_mmu(tlb, start, end); | ||
87 | |||
88 | /* keep the page table cache within bounds */ | ||
89 | check_pgt_cache(); | ||
90 | |||
91 | put_cpu_var(mmu_gathers); | ||
92 | } | ||
93 | |||
94 | /* tlb_remove_page | ||
95 | * Must perform the equivalent to __free_pte(pte_get_and_clear(ptep)), | ||
96 | * while handling the additional races in SMP caused by other CPUs | ||
97 | * caching valid mappings in their TLBs. | ||
98 | */ | ||
99 | static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page) | ||
100 | { | ||
101 | tlb->need_flush = 1; | ||
102 | free_page_and_swap_cache(page); | ||
103 | return; | ||
104 | } | ||
105 | |||
106 | /** | ||
107 | * tlb_remove_tlb_entry - remember a pte unmapping for later tlb invalidation. | ||
108 | * | ||
109 | * Record the fact that pte's were really umapped in ->need_flush, so we can | ||
110 | * later optimise away the tlb invalidate. This helps when userspace is | ||
111 | * unmapping already-unmapped pages, which happens quite a lot. | ||
112 | */ | ||
113 | #define tlb_remove_tlb_entry(tlb, ptep, address) \ | ||
114 | do { \ | ||
115 | tlb->need_flush = 1; \ | ||
116 | __tlb_remove_tlb_entry(tlb, ptep, address); \ | ||
117 | } while (0) | ||
118 | |||
119 | #define pte_free_tlb(tlb, ptep) __pte_free_tlb(tlb, ptep) | ||
120 | |||
121 | #define pud_free_tlb(tlb, pudp) __pud_free_tlb(tlb, pudp) | ||
122 | |||
123 | #define pmd_free_tlb(tlb, pmdp) __pmd_free_tlb(tlb, pmdp) | ||
124 | |||
125 | #define tlb_migrate_finish(mm) do {} while (0) | ||
126 | |||
127 | #endif | ||
diff --git a/include/asm-um/tlbflush.h b/include/asm-um/tlbflush.h deleted file mode 100644 index 614f2c091178..000000000000 --- a/include/asm-um/tlbflush.h +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __UM_TLBFLUSH_H | ||
7 | #define __UM_TLBFLUSH_H | ||
8 | |||
9 | #include <linux/mm.h> | ||
10 | |||
11 | /* | ||
12 | * TLB flushing: | ||
13 | * | ||
14 | * - flush_tlb() flushes the current mm struct TLBs | ||
15 | * - flush_tlb_all() flushes all processes TLBs | ||
16 | * - flush_tlb_mm(mm) flushes the specified mm context TLB's | ||
17 | * - flush_tlb_page(vma, vmaddr) flushes one page | ||
18 | * - flush_tlb_kernel_vm() flushes the kernel vm area | ||
19 | * - flush_tlb_range(vma, start, end) flushes a range of pages | ||
20 | */ | ||
21 | |||
22 | extern void flush_tlb_all(void); | ||
23 | extern void flush_tlb_mm(struct mm_struct *mm); | ||
24 | extern void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, | ||
25 | unsigned long end); | ||
26 | extern void flush_tlb_page(struct vm_area_struct *vma, unsigned long address); | ||
27 | extern void flush_tlb_kernel_vm(void); | ||
28 | extern void flush_tlb_kernel_range(unsigned long start, unsigned long end); | ||
29 | extern void __flush_tlb_one(unsigned long addr); | ||
30 | |||
31 | #endif | ||
diff --git a/include/asm-um/topology.h b/include/asm-um/topology.h deleted file mode 100644 index 0905e4f21d42..000000000000 --- a/include/asm-um/topology.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _ASM_UM_TOPOLOGY_H | ||
2 | #define _ASM_UM_TOPOLOGY_H | ||
3 | |||
4 | #include <asm-generic/topology.h> | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/types.h b/include/asm-um/types.h deleted file mode 100644 index 816e9590fc73..000000000000 --- a/include/asm-um/types.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_TYPES_H | ||
2 | #define __UM_TYPES_H | ||
3 | |||
4 | #include "asm/arch/types.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/uaccess.h b/include/asm-um/uaccess.h deleted file mode 100644 index b9a895d6fa1d..000000000000 --- a/include/asm-um/uaccess.h +++ /dev/null | |||
@@ -1,99 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __UM_UACCESS_H | ||
7 | #define __UM_UACCESS_H | ||
8 | |||
9 | #include <asm/errno.h> | ||
10 | #include <asm/processor.h> | ||
11 | |||
12 | /* thread_info has a mm_segment_t in it, so put the definition up here */ | ||
13 | typedef struct { | ||
14 | unsigned long seg; | ||
15 | } mm_segment_t; | ||
16 | |||
17 | #include "linux/thread_info.h" | ||
18 | |||
19 | #define VERIFY_READ 0 | ||
20 | #define VERIFY_WRITE 1 | ||
21 | |||
22 | /* | ||
23 | * The fs value determines whether argument validity checking should be | ||
24 | * performed or not. If get_fs() == USER_DS, checking is performed, with | ||
25 | * get_fs() == KERNEL_DS, checking is bypassed. | ||
26 | * | ||
27 | * For historical reasons, these macros are grossly misnamed. | ||
28 | */ | ||
29 | |||
30 | #define MAKE_MM_SEG(s) ((mm_segment_t) { (s) }) | ||
31 | |||
32 | #define KERNEL_DS MAKE_MM_SEG(0xFFFFFFFF) | ||
33 | #define USER_DS MAKE_MM_SEG(TASK_SIZE) | ||
34 | |||
35 | #define get_ds() (KERNEL_DS) | ||
36 | #define get_fs() (current_thread_info()->addr_limit) | ||
37 | #define set_fs(x) (current_thread_info()->addr_limit = (x)) | ||
38 | |||
39 | #define segment_eq(a, b) ((a).seg == (b).seg) | ||
40 | |||
41 | #include "um_uaccess.h" | ||
42 | |||
43 | #define __copy_from_user(to, from, n) copy_from_user(to, from, n) | ||
44 | |||
45 | #define __copy_to_user(to, from, n) copy_to_user(to, from, n) | ||
46 | |||
47 | #define __copy_to_user_inatomic __copy_to_user | ||
48 | #define __copy_from_user_inatomic __copy_from_user | ||
49 | |||
50 | #define __get_user(x, ptr) \ | ||
51 | ({ \ | ||
52 | const __typeof__(*(ptr)) __user *__private_ptr = (ptr); \ | ||
53 | __typeof__(x) __private_val; \ | ||
54 | int __private_ret = -EFAULT; \ | ||
55 | (x) = (__typeof__(*(__private_ptr)))0; \ | ||
56 | if (__copy_from_user((__force void *)&__private_val, (__private_ptr),\ | ||
57 | sizeof(*(__private_ptr))) == 0) { \ | ||
58 | (x) = (__typeof__(*(__private_ptr))) __private_val; \ | ||
59 | __private_ret = 0; \ | ||
60 | } \ | ||
61 | __private_ret; \ | ||
62 | }) | ||
63 | |||
64 | #define get_user(x, ptr) \ | ||
65 | ({ \ | ||
66 | const __typeof__((*(ptr))) __user *private_ptr = (ptr); \ | ||
67 | (access_ok(VERIFY_READ, private_ptr, sizeof(*private_ptr)) ? \ | ||
68 | __get_user(x, private_ptr) : ((x) = (__typeof__(*ptr))0, -EFAULT)); \ | ||
69 | }) | ||
70 | |||
71 | #define __put_user(x, ptr) \ | ||
72 | ({ \ | ||
73 | __typeof__(*(ptr)) __user *__private_ptr = ptr; \ | ||
74 | __typeof__(*(__private_ptr)) __private_val; \ | ||
75 | int __private_ret = -EFAULT; \ | ||
76 | __private_val = (__typeof__(*(__private_ptr))) (x); \ | ||
77 | if (__copy_to_user((__private_ptr), &__private_val, \ | ||
78 | sizeof(*(__private_ptr))) == 0) { \ | ||
79 | __private_ret = 0; \ | ||
80 | } \ | ||
81 | __private_ret; \ | ||
82 | }) | ||
83 | |||
84 | #define put_user(x, ptr) \ | ||
85 | ({ \ | ||
86 | __typeof__(*(ptr)) __user *private_ptr = (ptr); \ | ||
87 | (access_ok(VERIFY_WRITE, private_ptr, sizeof(*private_ptr)) ? \ | ||
88 | __put_user(x, private_ptr) : -EFAULT); \ | ||
89 | }) | ||
90 | |||
91 | #define strlen_user(str) strnlen_user(str, ~0U >> 1) | ||
92 | |||
93 | struct exception_table_entry | ||
94 | { | ||
95 | unsigned long insn; | ||
96 | unsigned long fixup; | ||
97 | }; | ||
98 | |||
99 | #endif | ||
diff --git a/include/asm-um/ucontext.h b/include/asm-um/ucontext.h deleted file mode 100644 index 5c96c0e607f0..000000000000 --- a/include/asm-um/ucontext.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _ASM_UM_UCONTEXT_H | ||
2 | #define _ASM_UM_UCONTEXT_H | ||
3 | |||
4 | #include "asm/arch/ucontext.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/unaligned.h b/include/asm-um/unaligned.h deleted file mode 100644 index a47196974e39..000000000000 --- a/include/asm-um/unaligned.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _ASM_UM_UNALIGNED_H | ||
2 | #define _ASM_UM_UNALIGNED_H | ||
3 | |||
4 | #include "asm/arch/unaligned.h" | ||
5 | |||
6 | #endif /* _ASM_UM_UNALIGNED_H */ | ||
diff --git a/include/asm-um/unistd.h b/include/asm-um/unistd.h deleted file mode 100644 index 38bd9d94ee46..000000000000 --- a/include/asm-um/unistd.h +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2000 - 2004 Jeff Dike (jdike@karaya.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef _UM_UNISTD_H_ | ||
7 | #define _UM_UNISTD_H_ | ||
8 | |||
9 | #include <linux/syscalls.h> | ||
10 | #include "linux/resource.h" | ||
11 | #include "asm/uaccess.h" | ||
12 | |||
13 | extern int um_execve(const char *file, char *const argv[], char *const env[]); | ||
14 | |||
15 | #ifdef __KERNEL__ | ||
16 | /* We get __ARCH_WANT_OLD_STAT and __ARCH_WANT_STAT64 from the base arch */ | ||
17 | #define __ARCH_WANT_OLD_READDIR | ||
18 | #define __ARCH_WANT_SYS_ALARM | ||
19 | #define __ARCH_WANT_SYS_GETHOSTNAME | ||
20 | #define __ARCH_WANT_SYS_PAUSE | ||
21 | #define __ARCH_WANT_SYS_SGETMASK | ||
22 | #define __ARCH_WANT_SYS_SIGNAL | ||
23 | #define __ARCH_WANT_SYS_TIME | ||
24 | #define __ARCH_WANT_SYS_UTIME | ||
25 | #define __ARCH_WANT_SYS_WAITPID | ||
26 | #define __ARCH_WANT_SYS_SOCKETCALL | ||
27 | #define __ARCH_WANT_SYS_FADVISE64 | ||
28 | #define __ARCH_WANT_SYS_GETPGRP | ||
29 | #define __ARCH_WANT_SYS_LLSEEK | ||
30 | #define __ARCH_WANT_SYS_NICE | ||
31 | #define __ARCH_WANT_SYS_OLD_GETRLIMIT | ||
32 | #define __ARCH_WANT_SYS_OLDUMOUNT | ||
33 | #define __ARCH_WANT_SYS_SIGPENDING | ||
34 | #define __ARCH_WANT_SYS_SIGPROCMASK | ||
35 | #define __ARCH_WANT_SYS_RT_SIGACTION | ||
36 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND | ||
37 | #endif | ||
38 | |||
39 | #include "asm/arch/unistd.h" | ||
40 | |||
41 | #endif /* _UM_UNISTD_H_*/ | ||
diff --git a/include/asm-um/user.h b/include/asm-um/user.h deleted file mode 100644 index aae414ee1f5e..000000000000 --- a/include/asm-um/user.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_USER_H | ||
2 | #define __UM_USER_H | ||
3 | |||
4 | #include "asm/arch/user.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/vga.h b/include/asm-um/vga.h deleted file mode 100644 index 903a592b00d0..000000000000 --- a/include/asm-um/vga.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_VGA_H | ||
2 | #define __UM_VGA_H | ||
3 | |||
4 | #include "asm/arch/vga.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/vm-flags-i386.h b/include/asm-um/vm-flags-i386.h deleted file mode 100644 index e0d24c568dbc..000000000000 --- a/include/asm-um/vm-flags-i386.h +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2004 Jeff Dike (jdike@addtoit.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __VM_FLAGS_I386_H | ||
7 | #define __VM_FLAGS_I386_H | ||
8 | |||
9 | #define VM_DATA_DEFAULT_FLAGS \ | ||
10 | (VM_READ | VM_WRITE | \ | ||
11 | ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ | ||
12 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | ||
13 | |||
14 | #endif | ||
diff --git a/include/asm-um/vm-flags-x86_64.h b/include/asm-um/vm-flags-x86_64.h deleted file mode 100644 index 3213edfa7888..000000000000 --- a/include/asm-um/vm-flags-x86_64.h +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2004 Jeff Dike (jdike@addtoit.com) | ||
3 | * Copyright 2003 PathScale, Inc. | ||
4 | * Licensed under the GPL | ||
5 | */ | ||
6 | |||
7 | #ifndef __VM_FLAGS_X86_64_H | ||
8 | #define __VM_FLAGS_X86_64_H | ||
9 | |||
10 | #define __VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ | ||
11 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | ||
12 | #define __VM_STACK_FLAGS (VM_GROWSDOWN | VM_READ | VM_WRITE | \ | ||
13 | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | \ | ||
14 | VM_MAYEXEC) | ||
15 | |||
16 | extern unsigned long vm_stack_flags, vm_stack_flags32; | ||
17 | extern unsigned long vm_data_default_flags, vm_data_default_flags32; | ||
18 | extern unsigned long vm_force_exec32; | ||
19 | |||
20 | #ifdef TIF_IA32 | ||
21 | #define VM_DATA_DEFAULT_FLAGS \ | ||
22 | (test_thread_flag(TIF_IA32) ? vm_data_default_flags32 : \ | ||
23 | vm_data_default_flags) | ||
24 | |||
25 | #define VM_STACK_DEFAULT_FLAGS \ | ||
26 | (test_thread_flag(TIF_IA32) ? vm_stack_flags32 : vm_stack_flags) | ||
27 | #endif | ||
28 | |||
29 | #define VM_DATA_DEFAULT_FLAGS vm_data_default_flags | ||
30 | |||
31 | #define VM_STACK_DEFAULT_FLAGS vm_stack_flags | ||
32 | |||
33 | #endif | ||
diff --git a/include/asm-um/vm86.h b/include/asm-um/vm86.h deleted file mode 100644 index 7801f82de1f4..000000000000 --- a/include/asm-um/vm86.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_VM86_H | ||
2 | #define __UM_VM86_H | ||
3 | |||
4 | #include "asm/arch/vm86.h" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-um/xor.h b/include/asm-um/xor.h deleted file mode 100644 index a19db3e17241..000000000000 --- a/include/asm-um/xor.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __UM_XOR_H | ||
2 | #define __UM_XOR_H | ||
3 | |||
4 | #include "asm-generic/xor.h" | ||
5 | |||
6 | #endif | ||