From: Paul Davies <pauld@gelato.unsw.edu.au>
To: linux-mm@kvack.org
Cc: Paul Davies <pauld@gelato.unsw.edu.au>
Subject: [PATCH 6/29] Tweak IA64 arch dependent files to work with PTI
Date: Sat, 13 Jan 2007 13:46:11 +1100 [thread overview]
Message-ID: <20070113024611.29682.41796.sendpatchset@weill.orchestra.cse.unsw.EDU.AU> (raw)
In-Reply-To: <20070113024540.29682.27024.sendpatchset@weill.orchestra.cse.unsw.EDU.AU>
PATCH 06 ia64
* Defines default page table config option: PT_DEFAULT in Kconfig.debug
to appear in kernel hacking.
* Adjusts arch dependent files referring to the pgd in the mm_struct
to do so via the new generic page table type (no pgd in mm_struct anymore).
Signed-Off-By: Paul Davies <pauld@gelato.unsw.edu.au>
---
arch/ia64/Kconfig.debug | 9 +++++++++
arch/ia64/kernel/init_task.c | 2 +-
arch/ia64/mm/hugetlbpage.c | 4 ++--
include/asm-ia64/mmu_context.h | 2 +-
include/asm-ia64/pgtable.h | 4 ++--
5 files changed, 15 insertions(+), 6 deletions(-)
Index: linux-2.6.20-rc4/include/asm-ia64/mmu_context.h
===================================================================
--- linux-2.6.20-rc4.orig/include/asm-ia64/mmu_context.h 2007-01-11 13:15:05.228780000 +1100
+++ linux-2.6.20-rc4/include/asm-ia64/mmu_context.h 2007-01-11 13:15:36.184250000 +1100
@@ -191,7 +191,7 @@
* We may get interrupts here, but that's OK because interrupt
* handlers cannot touch user-space.
*/
- ia64_set_kr(IA64_KR_PT_BASE, __pa(next->pgd));
+ ia64_set_kr(IA64_KR_PT_BASE, __pa(next->page_table.pgd));
activate_context(next);
}
Index: linux-2.6.20-rc4/include/asm-ia64/pgtable.h
===================================================================
--- linux-2.6.20-rc4.orig/include/asm-ia64/pgtable.h 2007-01-11 13:15:05.232782000 +1100
+++ linux-2.6.20-rc4/include/asm-ia64/pgtable.h 2007-01-11 13:15:36.184250000 +1100
@@ -346,13 +346,13 @@
static inline pgd_t*
pgd_offset (struct mm_struct *mm, unsigned long address)
{
- return mm->pgd + pgd_index(address);
+ return mm->page_table.pgd + pgd_index(address);
}
/* In the kernel's mapped region we completely ignore the region number
(since we know it's in region number 5). */
#define pgd_offset_k(addr) \
- (init_mm.pgd + (((addr) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1)))
+ (init_mm.page_table.pgd + (((addr) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1)))
/* Look up a pgd entry in the gate area. On IA-64, the gate-area
resides in the kernel-mapped segment, hence we use pgd_offset_k()
Index: linux-2.6.20-rc4/arch/ia64/kernel/init_task.c
===================================================================
--- linux-2.6.20-rc4.orig/arch/ia64/kernel/init_task.c 2007-01-11 13:15:05.232782000 +1100
+++ linux-2.6.20-rc4/arch/ia64/kernel/init_task.c 2007-01-11 13:15:36.188252000 +1100
@@ -12,9 +12,9 @@
#include <linux/sched.h>
#include <linux/init_task.h>
#include <linux/mqueue.h>
+#include <linux/pt.h>
#include <asm/uaccess.h>
-#include <asm/pgtable.h>
static struct fs_struct init_fs = INIT_FS;
static struct files_struct init_files = INIT_FILES;
Index: linux-2.6.20-rc4/arch/ia64/mm/hugetlbpage.c
===================================================================
--- linux-2.6.20-rc4.orig/arch/ia64/mm/hugetlbpage.c 2007-01-11 13:15:05.232782000 +1100
+++ linux-2.6.20-rc4/arch/ia64/mm/hugetlbpage.c 2007-01-11 13:16:53.160812000 +1100
@@ -16,8 +16,8 @@
#include <linux/smp_lock.h>
#include <linux/slab.h>
#include <linux/sysctl.h>
+#include <linux/pt.h>
#include <asm/mman.h>
-#include <asm/pgalloc.h>
#include <asm/tlb.h>
#include <asm/tlbflush.h>
@@ -136,7 +136,7 @@
if (REGION_NUMBER(ceiling) == RGN_HPAGE)
ceiling = htlbpage_to_page(ceiling);
- free_pgd_range(tlb, addr, end, floor, ceiling);
+ free_pt_range(tlb, addr, end, floor, ceiling);
}
unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
Index: linux-2.6.20-rc4/arch/ia64/Kconfig.debug
===================================================================
--- linux-2.6.20-rc4.orig/arch/ia64/Kconfig.debug 2007-01-11 13:15:05.232782000 +1100
+++ linux-2.6.20-rc4/arch/ia64/Kconfig.debug 2007-01-11 13:15:36.192254000 +1100
@@ -3,6 +3,15 @@
source "lib/Kconfig.debug"
choice
+ prompt "Page table selection"
+ default DEFAULT-PT
+
+config PT_DEFAULT
+ bool "PT_DEFAULT"
+
+endchoice
+
+choice
prompt "Physical memory granularity"
default IA64_GRANULE_64MB
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2007-01-13 2:46 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-13 2:45 [PATCH 0/29] Page Table Interface Explanation Paul Davies
2007-01-13 2:45 ` [PATCH 1/29] Abstract current page table implementation Paul Davies
2007-01-13 2:45 ` [PATCH 2/29] " Paul Davies
2007-01-13 2:45 ` [PATCH 3/29] " Paul Davies
2007-01-16 18:55 ` Christoph Lameter
2007-01-13 2:46 ` [PATCH 4/29] Introduce Page Table Interface (PTI) Paul Davies
2007-01-16 19:02 ` Christoph Lameter
2007-01-13 2:46 ` [PATCH 5/29] Start calling simple PTI functions Paul Davies
2007-01-16 19:04 ` Christoph Lameter
2007-01-18 6:43 ` Paul Cameron Davies
2007-01-13 2:46 ` Paul Davies [this message]
2007-01-16 19:05 ` [PATCH 6/29] Tweak IA64 arch dependent files to work with PTI Christoph Lameter
2007-01-13 2:46 ` [PATCH 7/29] Continue calling simple PTI functions Paul Davies
2007-01-16 19:08 ` Christoph Lameter
2007-01-13 2:46 ` [PATCH 8/29] Clean up page fault handers Paul Davies
2007-01-13 2:46 ` [PATCH 9/29] Clean up page fault handlers Paul Davies
2007-01-13 2:46 ` [PATCH 10/29] Call simple PTI functions Paul Davies
2007-01-13 2:46 ` [PATCH 11/29] Call simple PTI functions cont Paul Davies
2007-01-13 2:46 ` [PATCH 12/29] Abstract page table tear down Paul Davies
2007-01-13 2:46 ` [PATCH 13/29] Finish abstracting " Paul Davies
2007-01-13 2:46 ` [PATCH 14/29] Abstract copy page range iterator Paul Davies
2007-01-13 2:46 ` [PATCH 15/29] Finish abstracting copy page range Paul Davies
2007-01-13 2:47 ` [PATCH 16/29] Abstract unmap page range iterator Paul Davies
2007-01-13 2:47 ` [PATCH 17/29] Finish abstracting unmap page range Paul Davies
2007-01-13 2:47 ` [PATCH 18/29] Abstract zeromap " Paul Davies
2007-01-13 2:47 ` [PATCH 19/29] Abstract remap pfn range Paul Davies
2007-01-13 2:47 ` [PATCH 20/29] Abstract change protection iterator Paul Davies
2007-01-13 2:47 ` [PATCH 21/29] Abstract unmap vm area Paul Davies
2007-01-13 2:47 ` [PATCH 22/29] Abstract map " Paul Davies
2007-01-13 2:47 ` [PATCH 23/29] Abstract unuse_vma Paul Davies
2007-01-13 2:47 ` [PATCH 24/29] Abstract smaps iterator Paul Davies
2007-01-13 2:47 ` [PATCH 25/29] Abstact mempolicy iterator Paul Davies
2007-01-13 2:47 ` [PATCH 26/29] Abstract mempolicy iterator cont Paul Davies
2007-01-13 2:48 ` [PATCH 27/29] Abstract implementation dependent code for mremap Paul Davies
2007-01-13 2:48 ` [PATCH 28/29] Abstract ioremap iterator Paul Davies
2007-01-13 2:48 ` [PATCH 29/29] Tweak i386 arch dependent files to work with PTI Paul Davies
2007-01-13 2:48 ` [PATCH 1/5] Introduce IA64 page table interface Paul Davies
2007-01-13 2:48 ` [PATCH 2/5] Abstract pgtable Paul Davies
2007-01-13 2:48 ` [PATCH 3/5] Abstact pgtable continued Paul Davies
2007-01-13 2:48 ` [PATCH 4/5] Abstract assembler lookup Paul Davies
2007-01-13 2:48 ` [PATCH 5/5] Abstract pgalloc Paul Davies
2007-01-13 2:48 ` [PATCH 1/12] Alternate page table implementation (GPT) Paul Davies
2007-01-13 2:48 ` [PATCH 2/12] Alternate page table implementation cont Paul Davies
2007-01-13 2:48 ` [PATCH 3/12] " Paul Davies
2007-01-13 2:49 ` [PATCH 4/12] " Paul Davies
2007-01-13 2:49 ` [PATCH 5/12] " Paul Davies
2007-01-13 2:49 ` [PATCH 6/12] " Paul Davies
2007-01-13 2:49 ` [PATCH 7/12] " Paul Davies
2007-01-13 2:49 ` [PATCH 8/12] " Paul Davies
2007-01-13 2:49 ` [PATCH 9/12] " Paul Davies
2007-01-13 2:49 ` [PATCH 10/12] " Paul Davies
2007-01-13 2:49 ` [PATCH 11/12] " Paul Davies
2007-01-13 2:49 ` [PATCH 12/12] " Paul Davies
2007-01-13 19:29 ` [PATCH 0/29] Page Table Interface Explanation Peter Zijlstra
2007-01-14 10:06 ` Paul Cameron Davies
2007-01-16 18:49 ` Christoph Lameter
2007-01-18 6:22 ` Paul Cameron Davies
2007-01-16 18:51 ` Christoph Lameter
2007-01-18 6:53 ` Paul Cameron Davies
2007-01-16 19:14 ` Christoph Lameter
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=20070113024611.29682.41796.sendpatchset@weill.orchestra.cse.unsw.EDU.AU \
--to=pauld@gelato.unsw.edu.au \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).