diff options
author | Jeff Dike <jdike@addtoit.com> | 2005-05-20 16:59:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-20 18:48:18 -0400 |
commit | 7b9014c1da380384efe7752db38a0253a74d0238 (patch) | |
tree | 5120dc5b523664068b2fa2bdfa153db71d5a37a9 /arch/um/kernel | |
parent | 9b67a3c4cd380968bffe8efb681470acda42b441 (diff) |
[PATCH] uml: Remove ubd-mmap support
Finally rip out the ubd-mmap code, which turned out to be broken by design.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/kernel')
-rw-r--r-- | arch/um/kernel/trap_kern.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/arch/um/kernel/trap_kern.c b/arch/um/kernel/trap_kern.c index 9ae2eff0d8f3..1de22d8a313a 100644 --- a/arch/um/kernel/trap_kern.c +++ b/arch/um/kernel/trap_kern.c | |||
@@ -107,33 +107,6 @@ out_of_memory: | |||
107 | goto out; | 107 | goto out; |
108 | } | 108 | } |
109 | 109 | ||
110 | LIST_HEAD(physmem_remappers); | ||
111 | |||
112 | void register_remapper(struct remapper *info) | ||
113 | { | ||
114 | list_add(&info->list, &physmem_remappers); | ||
115 | } | ||
116 | |||
117 | static int check_remapped_addr(unsigned long address, int is_write) | ||
118 | { | ||
119 | struct remapper *remapper; | ||
120 | struct list_head *ele; | ||
121 | __u64 offset; | ||
122 | int fd; | ||
123 | |||
124 | fd = phys_mapping(__pa(address), &offset); | ||
125 | if(fd == -1) | ||
126 | return(0); | ||
127 | |||
128 | list_for_each(ele, &physmem_remappers){ | ||
129 | remapper = list_entry(ele, struct remapper, list); | ||
130 | if((*remapper->proc)(fd, address, is_write, offset)) | ||
131 | return(1); | ||
132 | } | ||
133 | |||
134 | return(0); | ||
135 | } | ||
136 | |||
137 | /* | 110 | /* |
138 | * We give a *copy* of the faultinfo in the regs to segv. | 111 | * We give a *copy* of the faultinfo in the regs to segv. |
139 | * This must be done, since nesting SEGVs could overwrite | 112 | * This must be done, since nesting SEGVs could overwrite |
@@ -152,8 +125,6 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user, void *sc) | |||
152 | flush_tlb_kernel_vm(); | 125 | flush_tlb_kernel_vm(); |
153 | return(0); | 126 | return(0); |
154 | } | 127 | } |
155 | else if(check_remapped_addr(address & PAGE_MASK, is_write)) | ||
156 | return(0); | ||
157 | else if(current->mm == NULL) | 128 | else if(current->mm == NULL) |
158 | panic("Segfault with no mm"); | 129 | panic("Segfault with no mm"); |
159 | err = handle_page_fault(address, ip, is_write, is_user, &si.si_code); | 130 | err = handle_page_fault(address, ip, is_write, is_user, &si.si_code); |