Skip to content

Commit

Permalink
[MIPS] Do not lose upper 32-bit on MIPS32 with 64-bit addresses in __…
Browse files Browse the repository at this point in the history
…pte().

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Ralf Baechle committed Sep 27, 2006
1 parent 65316fd commit d34555f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion include/asm-mips/page.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,17 @@ static inline void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
#ifdef CONFIG_CPU_MIPS32
typedef struct { unsigned long pte_low, pte_high; } pte_t;
#define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
#define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
#else
typedef struct { unsigned long long pte; } pte_t;
#define pte_val(x) ((x).pte)
#define __pte(x) ((pte_t) { (x) } )
#endif
#else
typedef struct { unsigned long pte; } pte_t;
#define pte_val(x) ((x).pte)
#endif
#define __pte(x) ((pte_t) { (x) } )
#endif

/*
* For 3-level pagetables we defines these ourselves, for 2-level the
Expand Down

0 comments on commit d34555f

Please sign in to comment.