Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7fe8781 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: obvious compile fixes for x86-64 Subarch and x86 regression fixes 



This patch does some totally trivial compilation fixes.  It also restores the
debugregs manipulation, which was commented out simply because it doesn't
compile on x86_64 (we haven't yet implemented there debugregs handling).

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1f8d419e

arch/um/kernel/ptrace.c

+3 −1
Original line number Diff line number Diff line
@@ -98,12 +98,14 @@ long sys_ptrace(long request, long pid, long addr, long data) 
		if(addr < MAX_REG_OFFSET){

			tmp = getreg(child, addr);

		}

#if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)

		else if((addr >= offsetof(struct user, u_debugreg[0])) &&

			(addr <= offsetof(struct user, u_debugreg[7]))){

			addr -= offsetof(struct user, u_debugreg[0]);

			addr = addr >> 2;

			tmp = child->thread.arch.debugregs[addr];

		}

#endif

		ret = put_user(tmp, (unsigned long __user *) data);

		break;

	}
@@ -127,7 +129,7 @@ long sys_ptrace(long request, long pid, long addr, long data) 
			ret = putreg(child, addr, data);

			break;

		}

#if 0 /* XXX x86_64 */

#if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)

		else if((addr >= offsetof(struct user, u_debugreg[0])) &&

			(addr <= offsetof(struct user, u_debugreg[7]))){

			  addr -= offsetof(struct user, u_debugreg[0]);

arch/um/sys-x86_64/syscalls.c

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
#include "linux/linkage.h"

#include "linux/slab.h"

#include "linux/shm.h"

#include "linux/utsname.h"

#include "linux/personality.h"

#include "asm/uaccess.h"

#define __FRAME_OFFSETS

#include "asm/ptrace.h"

include/asm-um/ipc.h

+1 −6
Original line number Diff line number Diff line 
#ifndef __UM_IPC_H

#define __UM_IPC_H



#include "asm/arch/ipc.h"



#endif
 
#include <asm-generic/ipc.h>

include/asm-um/page.h

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ typedef struct { unsigned long pgd; } pgd_t; 
	({ (pte).pte_high = (phys) >> 32; \

	   (pte).pte_low = (phys) | pgprot_val(prot); })



#define pmd_val(x)	((x).pmd)

#define __pmd(x) ((pmd_t) { (x) } )



typedef unsigned long long pfn_t;

typedef unsigned long long phys_t;

include/asm-um/pgtable-3level.h

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static inline pmd_t pfn_pmd(pfn_t page_nr, pgprot_t pgprot) 


#define pte_to_pgoff(p) ((p).pte >> 32)



#define pgoff_to_pte(off) ((pte_t) { ((off) < 32) | _PAGE_FILE })

#define pgoff_to_pte(off) ((pte_t) { ((off) << 32) | _PAGE_FILE })



#else