From: Dave Hansen <haveblue@us.ibm.com>
To: Andrew Morton <akpm@digeo.com>
Cc: linux-mm@kvack.org
Subject: [PATCH] remove __pgd_offset
Date: Tue, 04 Mar 2003 15:00:34 -0800 [thread overview]
Message-ID: <3E653012.5040503@us.ibm.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 555 bytes --]
__pgd_offset() and pgd_offset() are completely different functions.
__pgd_offset() is really just a helper to figure out which entry in a
pgd an address would fall into. pgd_offset() does all the leg work and
actually fetches the real pgd entry.
pgd_index() is a much saner name for what __pgd_offset() does. In fact,
we do this:
#define __pgd_offset(address) pgd_index(address)
The attached patch removes all instances of __pgd_offset and just
replaces them with pgd_index.
Compiles with and without PAE on x86.
--
Dave Hansen
haveblue@us.ibm.com
[-- Attachment #2: pgdindex-2.5.63-0.patch --]
[-- Type: text/plain, Size: 7941 bytes --]
diff -ur ../linux-2.5.63-clean/arch/alpha/mm/fault.c linux-2.5.63-pgdindex/arch/alpha/mm/fault.c
--- ../linux-2.5.63-clean/arch/alpha/mm/fault.c Mon Feb 24 11:05:14 2003
+++ linux-2.5.63-pgdindex/arch/alpha/mm/fault.c Tue Mar 4 14:33:00 2003
@@ -232,11 +232,11 @@
else {
/* Synchronize this task's top level page-table
with the "reference" page table from init. */
- long offset = __pgd_offset(address);
+ long index = pgd_index(address);
pgd_t *pgd, *pgd_k;
- pgd = current->active_mm->pgd + offset;
- pgd_k = swapper_pg_dir + offset;
+ pgd = current->active_mm->pgd + index;
+ pgd_k = swapper_pg_dir + index;
if (!pgd_present(*pgd) && pgd_present(*pgd_k)) {
pgd_val(*pgd) = pgd_val(*pgd_k);
return;
diff -ur ../linux-2.5.63-clean/arch/arm/mm/fault-common.c linux-2.5.63-pgdindex/arch/arm/mm/fault-common.c
--- ../linux-2.5.63-clean/arch/arm/mm/fault-common.c Mon Feb 24 11:05:34 2003
+++ linux-2.5.63-pgdindex/arch/arm/mm/fault-common.c Tue Mar 4 14:33:42 2003
@@ -342,20 +342,20 @@
struct pt_regs *regs)
{
struct task_struct *tsk;
- unsigned int offset;
+ unsigned int index;
pgd_t *pgd, *pgd_k;
pmd_t *pmd, *pmd_k;
if (addr < TASK_SIZE)
return do_page_fault(addr, fsr, regs);
- offset = __pgd_offset(addr);
+ index = pgd_index(addr);
/*
* FIXME: CP15 C1 is write only on ARMv3 architectures.
*/
- pgd = cpu_get_pgd() + offset;
- pgd_k = init_mm.pgd + offset;
+ pgd = cpu_get_pgd() + index;
+ pgd_k = init_mm.pgd + index;
if (pgd_none(*pgd_k))
goto bad_area;
diff -ur ../linux-2.5.63-clean/arch/i386/mm/fault.c linux-2.5.63-pgdindex/arch/i386/mm/fault.c
--- ../linux-2.5.63-clean/arch/i386/mm/fault.c Mon Feb 24 11:05:04 2003
+++ linux-2.5.63-pgdindex/arch/i386/mm/fault.c Tue Mar 4 14:25:06 2003
@@ -394,14 +394,14 @@
* Do _not_ use "tsk" here. We might be inside
* an interrupt in the middle of a task switch..
*/
- int offset = __pgd_offset(address);
+ int index = pgd_index(address);
pgd_t *pgd, *pgd_k;
pmd_t *pmd, *pmd_k;
pte_t *pte_k;
asm("movl %%cr3,%0":"=r" (pgd));
- pgd = offset + (pgd_t *)__va(pgd);
- pgd_k = init_mm.pgd + offset;
+ pgd = index + (pgd_t *)__va(pgd);
+ pgd_k = init_mm.pgd + index;
if (!pgd_present(*pgd_k))
goto no_context;
diff -ur ../linux-2.5.63-clean/arch/i386/mm/init.c linux-2.5.63-pgdindex/arch/i386/mm/init.c
--- ../linux-2.5.63-clean/arch/i386/mm/init.c Mon Feb 24 11:05:39 2003
+++ linux-2.5.63-pgdindex/arch/i386/mm/init.c Tue Mar 4 14:38:43 2003
@@ -98,15 +98,15 @@
{
pgd_t *pgd;
pmd_t *pmd;
- int pgd_ofs, pmd_ofs;
+ int pgd_idx, pmd_ofs;
unsigned long vaddr;
vaddr = start;
- pgd_ofs = __pgd_offset(vaddr);
+ pgd_idx = pgd_index(vaddr);
pmd_ofs = __pmd_offset(vaddr);
- pgd = pgd_base + pgd_ofs;
+ pgd = pgd_base + pgd_idx;
- for ( ; (pgd_ofs < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_ofs++) {
+ for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
if (pgd_none(*pgd))
one_md_table_init(pgd);
@@ -132,13 +132,13 @@
pgd_t *pgd;
pmd_t *pmd;
pte_t *pte;
- int pgd_ofs, pmd_ofs, pte_ofs;
+ int pgd_idx, pmd_ofs, pte_ofs;
- pgd_ofs = __pgd_offset(PAGE_OFFSET);
- pgd = pgd_base + pgd_ofs;
+ pgd_idx = pgd_index(PAGE_OFFSET);
+ pgd = pgd_base + pgd_idx;
pfn = 0;
- for (; pgd_ofs < PTRS_PER_PGD; pgd++, pgd_ofs++) {
+ for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
pmd = one_md_table_init(pgd);
if (pfn >= max_low_pfn)
continue;
@@ -214,7 +214,7 @@
vaddr = PKMAP_BASE;
page_table_range_init(vaddr, vaddr + PAGE_SIZE*LAST_PKMAP, pgd_base);
- pgd = swapper_pg_dir + __pgd_offset(vaddr);
+ pgd = swapper_pg_dir + pgd_index(vaddr);
pmd = pmd_offset(pgd, vaddr);
pte = pte_offset_kernel(pmd, vaddr);
pkmap_page_table = pte;
diff -ur ../linux-2.5.63-clean/arch/i386/mm/pgtable.c linux-2.5.63-pgdindex/arch/i386/mm/pgtable.c
--- ../linux-2.5.63-clean/arch/i386/mm/pgtable.c Mon Feb 24 11:06:03 2003
+++ linux-2.5.63-pgdindex/arch/i386/mm/pgtable.c Tue Mar 4 14:28:05 2003
@@ -63,7 +63,7 @@
pmd_t *pmd;
pte_t *pte;
- pgd = swapper_pg_dir + __pgd_offset(vaddr);
+ pgd = swapper_pg_dir + pgd_index(vaddr);
if (pgd_none(*pgd)) {
BUG();
return;
@@ -103,7 +103,7 @@
printk ("set_pmd_pfn: pfn misaligned\n");
return; /* BUG(); */
}
- pgd = swapper_pg_dir + __pgd_offset(vaddr);
+ pgd = swapper_pg_dir + pgd_index(vaddr);
if (pgd_none(*pgd)) {
printk ("set_pmd_pfn: pgd_none\n");
return; /* BUG(); */
diff -ur ../linux-2.5.63-clean/arch/um/kernel/mem.c linux-2.5.63-pgdindex/arch/um/kernel/mem.c
--- ../linux-2.5.63-clean/arch/um/kernel/mem.c Mon Feb 24 11:05:16 2003
+++ linux-2.5.63-pgdindex/arch/um/kernel/mem.c Tue Mar 4 14:34:13 2003
@@ -154,7 +154,7 @@
unsigned long vaddr;
vaddr = start;
- i = __pgd_offset(vaddr);
+ i = pgd_index(vaddr);
j = __pmd_offset(vaddr);
pgd = pgd_base + i;
@@ -257,7 +257,7 @@
vaddr = PKMAP_BASE;
fixrange_init(vaddr, vaddr + PAGE_SIZE*LAST_PKMAP, swapper_pg_dir);
- pgd = swapper_pg_dir + __pgd_offset(vaddr);
+ pgd = swapper_pg_dir + pgd_index(vaddr);
pmd = pmd_offset(pgd, vaddr);
pte = pte_offset_kernel(pmd, vaddr);
pkmap_page_table = pte;
diff -ur ../linux-2.5.63-clean/include/asm-alpha/pgtable.h linux-2.5.63-pgdindex/include/asm-alpha/pgtable.h
--- ../linux-2.5.63-clean/include/asm-alpha/pgtable.h Mon Feb 24 11:05:14 2003
+++ linux-2.5.63-pgdindex/include/asm-alpha/pgtable.h Tue Mar 4 14:32:31 2003
@@ -273,7 +273,6 @@
/* to find an entry in a page-table-directory. */
#define pgd_index(address) ((address >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))
-#define __pgd_offset(address) pgd_index(address)
#define pgd_offset(mm, address) ((mm)->pgd+pgd_index(address))
/* Find an entry in the second-level page table.. */
diff -ur ../linux-2.5.63-clean/include/asm-arm/pgtable.h linux-2.5.63-pgdindex/include/asm-arm/pgtable.h
--- ../linux-2.5.63-clean/include/asm-arm/pgtable.h Mon Feb 24 11:05:14 2003
+++ linux-2.5.63-pgdindex/include/asm-arm/pgtable.h Tue Mar 4 14:32:37 2003
@@ -116,7 +116,6 @@
/* to find an entry in a page-table-directory */
#define pgd_index(addr) ((addr) >> PGDIR_SHIFT)
-#define __pgd_offset(addr) pgd_index(addr)
#define pgd_offset(mm, addr) ((mm)->pgd+pgd_index(addr))
diff -ur ../linux-2.5.63-clean/include/asm-i386/pgtable.h linux-2.5.63-pgdindex/include/asm-i386/pgtable.h
--- ../linux-2.5.63-clean/include/asm-i386/pgtable.h Mon Feb 24 11:05:39 2003
+++ linux-2.5.63-pgdindex/include/asm-i386/pgtable.h Tue Mar 4 14:24:36 2003
@@ -236,8 +236,6 @@
/* to find an entry in a page-table-directory. */
#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
-#define __pgd_offset(address) pgd_index(address)
-
#define pgd_offset(mm, address) ((mm)->pgd+pgd_index(address))
/* to find an entry in a kernel page-table-directory */
diff -ur ../linux-2.5.63-clean/include/asm-sh/pgtable.h linux-2.5.63-pgdindex/include/asm-sh/pgtable.h
--- ../linux-2.5.63-clean/include/asm-sh/pgtable.h Mon Feb 24 11:06:03 2003
+++ linux-2.5.63-pgdindex/include/asm-sh/pgtable.h Tue Mar 4 14:32:40 2003
@@ -274,7 +274,6 @@
/* to find an entry in a page-table-directory. */
#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
-#define __pgd_offset(address) pgd_index(address)
#define pgd_offset(mm, address) ((mm)->pgd+pgd_index(address))
/* to find an entry in a kernel page-table-directory */
diff -ur ../linux-2.5.63-clean/include/asm-um/pgtable.h linux-2.5.63-pgdindex/include/asm-um/pgtable.h
--- ../linux-2.5.63-clean/include/asm-um/pgtable.h Mon Feb 24 11:06:03 2003
+++ linux-2.5.63-pgdindex/include/asm-um/pgtable.h Tue Mar 4 14:32:42 2003
@@ -357,7 +357,6 @@
/* to find an entry in a page-table-directory. */
#define pgd_index(address) ((address >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
-#define __pgd_offset(address) pgd_index(address)
/* to find an entry in a page-table-directory */
#define pgd_offset(mm, address) \
next reply other threads:[~2003-03-04 23:00 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-03-04 23:00 Dave Hansen [this message]
2003-03-04 23:02 ` [PATCH] remove __pmd_offset Dave Hansen
2003-03-04 23:03 ` [PATCH] remove __pte_offset Dave Hansen
2003-03-04 23:10 ` Benjamin LaHaise
2003-03-04 23:09 ` Martin J. Bligh
2003-03-04 23:22 ` Andrew Morton
2003-03-04 23:25 ` Dave Hansen
2003-03-04 23:26 ` Benjamin LaHaise
2003-03-04 23:29 ` Martin J. Bligh
2003-03-04 23:57 ` Dave Hansen
2003-03-05 0:01 ` Andrew Morton
2003-03-05 1:43 ` Martin J. Bligh
2003-03-05 2:04 ` Andrew Morton
2003-03-05 3:32 ` Randy.Dunlap
2003-03-04 23:16 ` Dave Hansen
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=3E653012.5040503@us.ibm.com \
--to=haveblue@us.ibm.com \
--cc=akpm@digeo.com \
--cc=linux-mm@kvack.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.