UML - Re-remove accidentally restored code
PATCH 1/7 UML - Re-remove accidentally restored code
aout-suppress-aout-library-support-if-config_arch_supports_aout.patch restores some code which had been deleted by uml-move-um_virt_to_phys.patch and uml-add-virt_to_pte.patch, presumably due to a botched diff.
This patch gets rid of it again.
Cc David Howells <[email protected]>
Signed-off-by Jeff Dike <[email protected]>
--- arch/um/kernel/process.c | 44 -------------------------------------------- 1 file changed, 44 deletions(-)
arch/um/kernel/process.c +0 -44
@@ -4,7 +4,6 @@* Licensed under the GPL */ -#include "linux/module.h" #include "linux/stddef.h" #include "linux/err.h" #include "linux/hardirq.h"
@@ -256,49 +255,6 @@ void cpu_idle(void)default_idle (); } -void *um_virt_to_phys (struct task_struct *task,unsigned long addr, -pte_t *pte_out) -{ -pgd_t *pgd; -pud_t *pud; -pmd_t *pmd; -pte_t *pte; -pte_t ptent; - -if (task->mm ==NULL ) -return ERR_PTR (-EINVAL ); - pgd =pgd_offset (task->mm, addr); -if (!pgd_present (*pgd)) -return ERR_PTR (-EINVAL ); - - pud =pud_offset (pgd, addr); -if (!pud_present (*pud)) -return ERR_PTR (-EINVAL ); - - pmd =pmd_offset (pud, addr); -if (!pmd_present (*pmd)) -return ERR_PTR (-EINVAL ); - - pte =pte_offset_kernel (pmd, addr); - ptent = *pte; -if (!pte_present (ptent)) -return ERR_PTR (-EINVAL ); - -if (pte_out !=NULL ) - *pte_out = ptent; -return (void *) (pte_val (ptent) &PAGE_MASK ) + (addr & ~PAGE_MASK ); -} - -char *current_cmd (void ) -{ -#if defined(CONFIG_SMP ) || defined(CONFIG_HIGHMEM ) -return "(Unknown)" ; -#else -void *addr =um_virt_to_phys (current, current->mm->arg_start,NULL ); -return IS_ERR (addr) ?"(Unknown)" :__va ((unsigned long ) addr); -#endif -} -int __cant_sleep (void ) {return in_atomic () ||irqs_disabled () ||in_interrupt ();/* Is in_interrupt() really needed? */
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel