diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /arch/sh/mm/hugetlbpage.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'arch/sh/mm/hugetlbpage.c')
| -rw-r--r-- | arch/sh/mm/hugetlbpage.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sh/mm/hugetlbpage.c b/arch/sh/mm/hugetlbpage.c index 95bb1a6c6060..6b7a7688c98e 100644 --- a/arch/sh/mm/hugetlbpage.c +++ b/arch/sh/mm/hugetlbpage.c | |||
| @@ -54,8 +54,6 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr) | |||
| 54 | return pte; | 54 | return pte; |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | #define mk_pte_huge(entry) do { pte_val(entry) |= _PAGE_SZHUGE; } while (0) | ||
| 58 | |||
| 59 | void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, | 57 | void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, |
| 60 | pte_t *ptep, pte_t entry) | 58 | pte_t *ptep, pte_t entry) |
| 61 | { | 59 | { |