diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /arch/sparc/mm/sun4c.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/sparc/mm/sun4c.c')
| -rw-r--r-- | arch/sparc/mm/sun4c.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c index c0442e8c4b15..2375fe9dc312 100644 --- a/arch/sparc/mm/sun4c.c +++ b/arch/sparc/mm/sun4c.c | |||
| @@ -1941,9 +1941,7 @@ static pte_t *sun4c_pte_alloc_one_kernel(struct mm_struct *mm, unsigned long add | |||
| 1941 | if ((pte = sun4c_pte_alloc_one_fast(mm, address)) != NULL) | 1941 | if ((pte = sun4c_pte_alloc_one_fast(mm, address)) != NULL) |
| 1942 | return pte; | 1942 | return pte; |
| 1943 | 1943 | ||
| 1944 | pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT); | 1944 | pte = (pte_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT); |
| 1945 | if (pte) | ||
| 1946 | memset(pte, 0, PAGE_SIZE); | ||
| 1947 | return pte; | 1945 | return pte; |
| 1948 | } | 1946 | } |
| 1949 | 1947 | ||