diff options
author | Jeff Dike <jdike@addtoit.com> | 2008-02-05 01:30:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:28 -0500 |
commit | 9157f90f08f7db3188cd06971f41cb2ba5646e57 (patch) | |
tree | f8a546798ec49d973117b012973b1af38014bd2b /arch/um/kernel/process.c | |
parent | b8bec829c90d45a2d115a52f3a928ce841afc3d4 (diff) |
uml: move um_virt_to_phys
This patchset makes UML build and run with three-level page tables on
32-bit hosts. This is an uncommon use case, but the code here needed
fixing and cleaning up, so 32-bit three-level pages tables were tested
to make sure the changes are good.
Patch 1 - code movement
Patch 2 - header untangling
Patch 3 - style fixups in files affected so far
Patch 4 - clean up use of current.h
Patch 5 - fix sizes of types that are different between 2 and 3-level
page tables - three-level page table support should build at
this point
Patch 6 - tidy (i.e. eliminate much of) the code that figures out how
big the address space is
Patch 7 - change um_virt_to_phys into virt_to_pte, clean its
interface, and clean its (so far) one caller
Patch 8 - the stub pages are covered with a VMA, allowing some nasty
code to be thrown out - three-level page tables now work
This patch:
um_virt_to_phys only has one user, so it can be moved to the same file
and made static. Its declarations in pgtable.h and ksyms.c are also
gone.
current_cmd was another apparent user, but it itself isn't used, so it
is deleted.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/kernel/process.c')
-rw-r--r-- | arch/um/kernel/process.c | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 62a4e0e12c9c..541a2bf331c5 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c | |||
@@ -255,49 +255,6 @@ void cpu_idle(void) | |||
255 | default_idle(); | 255 | default_idle(); |
256 | } | 256 | } |
257 | 257 | ||
258 | void *um_virt_to_phys(struct task_struct *task, unsigned long addr, | ||
259 | pte_t *pte_out) | ||
260 | { | ||
261 | pgd_t *pgd; | ||
262 | pud_t *pud; | ||
263 | pmd_t *pmd; | ||
264 | pte_t *pte; | ||
265 | pte_t ptent; | ||
266 | |||
267 | if (task->mm == NULL) | ||
268 | return ERR_PTR(-EINVAL); | ||
269 | pgd = pgd_offset(task->mm, addr); | ||
270 | if (!pgd_present(*pgd)) | ||
271 | return ERR_PTR(-EINVAL); | ||
272 | |||
273 | pud = pud_offset(pgd, addr); | ||
274 | if (!pud_present(*pud)) | ||
275 | return ERR_PTR(-EINVAL); | ||
276 | |||
277 | pmd = pmd_offset(pud, addr); | ||
278 | if (!pmd_present(*pmd)) | ||
279 | return ERR_PTR(-EINVAL); | ||
280 | |||
281 | pte = pte_offset_kernel(pmd, addr); | ||
282 | ptent = *pte; | ||
283 | if (!pte_present(ptent)) | ||
284 | return ERR_PTR(-EINVAL); | ||
285 | |||
286 | if (pte_out != NULL) | ||
287 | *pte_out = ptent; | ||
288 | return (void *) (pte_val(ptent) & PAGE_MASK) + (addr & ~PAGE_MASK); | ||
289 | } | ||
290 | |||
291 | char *current_cmd(void) | ||
292 | { | ||
293 | #if defined(CONFIG_SMP) || defined(CONFIG_HIGHMEM) | ||
294 | return "(Unknown)"; | ||
295 | #else | ||
296 | void *addr = um_virt_to_phys(current, current->mm->arg_start, NULL); | ||
297 | return IS_ERR(addr) ? "(Unknown)": __va((unsigned long) addr); | ||
298 | #endif | ||
299 | } | ||
300 | |||
301 | void dump_thread(struct pt_regs *regs, struct user *u) | 258 | void dump_thread(struct pt_regs *regs, struct user *u) |
302 | { | 259 | { |
303 | } | 260 | } |