From: "O.Sezer" <sezero@superonline.com>
To: linux-kernel@vger.kernel.org
Subject: Re: rmap and nvidia?
Date: Tue, 17 Dec 2002 00:22:34 +0200 [thread overview]
Message-ID: <3DFE522A.6010803@superonline.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 93 bytes --]
Is this patch correct in any way?
(Ripped out of the 2.5 patch and modified some).
Thanks.
[-- Attachment #2: NVIDIA_kernel_rmap.patch --]
[-- Type: text/plain, Size: 2173 bytes --]
diff -urN NVIDIA_kernel-1.0-4191/nv.c NVIDIA_kernel.rmap15b/nv.c
--- NVIDIA_kernel-1.0-4191/nv.c 2002-12-09 22:27:15.000000000 +0200
+++ NVIDIA_kernel.rmap15b/nv.c 2002-12-17 00:03:12.000000000 +0200
@@ -2217,7 +2217,7 @@
{
pgd_t *pg_dir;
pmd_t *pg_mid_dir;
- pte_t *pte__, pte;
+ pte_t pte;
#if defined(NVCPU_IA64)
if (address > __IA64_UNCACHED_OFFSET)
@@ -2241,14 +2241,7 @@
if (pmd_none(*pg_mid_dir))
goto failed;
-#if defined (pte_offset_atomic)
- pte__ = pte_offset_atomic(pg_mid_dir, address);
- pte = *pte__;
- pte_kunmap(pte__);
-#else
- pte__ = NULL;
- pte = *pte_offset(pg_mid_dir, address);
-#endif
+ PTE_OFFSET(pg_mid_dir, address, pte);
if (!pte_present(pte))
goto failed;
diff -urN NVIDIA_kernel-1.0-4191/nv-linux.h NVIDIA_kernel.rmap15b/nv-linux.h
--- NVIDIA_kernel-1.0-4191/nv-linux.h 2002-12-09 22:27:15.000000000 +0200
+++ NVIDIA_kernel.rmap15b/nv-linux.h 2002-12-17 00:02:19.000000000 +0200
@@ -146,6 +146,28 @@
# define VMA_PRIVATE(vma) ((void*)((vma)->vm_pte))
#endif
+#ifdef pte_offset_map /* rmap-vm or 2.5 */
+#define PTE_OFFSET(pmd, address, pte) \
+ { \
+ pte_t *pPTE; \
+ pPTE = pte_offset_map(pmd, address); \
+ pte = *pPTE; \
+ pte_unmap(pPTE); \
+ }
+#else
+#ifdef pte_offset_atomic /* aa-vm */
+#define PTE_OFFSET(pmd, address, pte) \
+ { \
+ pte_t *pPTE; \
+ pPTE = pte_offset_atomic(pmd, address); \
+ pte = *pPTE; \
+ pte_kunmap(pPTE); \
+ }
+#else /* !pte_offset_atomic */
+#define PTE_OFFSET(pmd, address, pte) (pte = *pte_offset(pmd, address))
+#endif /* pte_offset_atomic */
+#endif /* pte_offset_map */
+
#define NV_PAGE_ALIGN(addr) ( ((addr) + PAGE_SIZE - 1) / PAGE_SIZE)
#define NV_MASK_OFFSET(addr) ( (addr) & (PAGE_SIZE - 1) )
next reply other threads:[~2002-12-16 22:25 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-12-16 22:22 O.Sezer [this message]
2002-12-16 23:17 ` rmap and nvidia? Eyal Lebedinsky
2002-12-17 9:58 ` Andrew McGregor
2002-12-17 19:35 ` Andrew McGregor
2002-12-17 20:14 ` O.Sezer
-- strict thread matches above, loose matches on Subject: below --
2002-12-16 14:25 O.Sezer
2002-12-16 15:42 ` William Lee Irwin III
2002-12-14 9:36 mdew
2002-12-14 9:38 ` William Lee Irwin III
2002-12-14 9:46 ` mdew
2002-12-14 14:26 ` Rik van Riel
2002-12-15 1:23 ` Eyal Lebedinsky
2002-12-15 1:28 ` Philip Dodd
2002-12-15 1:40 ` Eyal Lebedinsky
2002-12-16 13:32 ` Ducrot Bruno
2002-12-16 18:42 ` Andrew McGregor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3DFE522A.6010803@superonline.com \
--to=sezero@superonline.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox